From 116d59c009774e2062d1ad5348d33a2a056967be Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 13:55:37 +0500 Subject: [PATCH 1/9] Add CI script for auto checking each AQO commit. --- .github/workflows/c-cpp.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/c-cpp.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 00000000..7cba65a9 --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,27 @@ +name: C/C++ CI for the master + +on: + push: + branches: [ ci-test ] + pull_request: + branches: [ ci-test ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: pg + run: | + echo "Deploying to production server on branch $GITHUB_REF" + git config --global user.email "ci@postgrespro.ru" + git config --global user.name "CI PgPro admin" + git clone https://github.com/postgres/postgres.git pg + cd pg + git checkout master + ./configure --prefix=`pwd`/tmp_install + git subtree add --prefix=contrib/aqo https://github.com/postgrespro/aqo.git $GITHUB_REF + patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_master.patch + make -j4 > /dev/null && make -j4 -C contrib > /dev/null + make -C contrib/aqo check From 126b2fa48b0898abbff8dae37db6719e80a282cf Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:16:10 +0500 Subject: [PATCH 2/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7cba65a9..7afad601 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI for the master on: push: - branches: [ ci-test ] + branches: [ ci-test1 ] pull_request: - branches: [ ci-test ] + branches: [ ci-test1 ] jobs: build: From e8fd1f056643823f449f7af3a5c2d40abcb3439a Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:27:40 +0500 Subject: [PATCH 3/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7afad601..9d979c6b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -1,4 +1,4 @@ -name: C/C++ CI for the master +name: 'C/C++ CI for the stable11' on: push: From b8657e405d2d566c5fb78efd8ff07aabbfc1d828 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:29:45 +0500 Subject: [PATCH 4/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9d979c6b..e9edbb1b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: 'C/C++ CI for the stable11' on: push: - branches: [ ci-test1 ] + branches: [ stable11-ci ] pull_request: - branches: [ ci-test1 ] + branches: [ stable11-ci ] jobs: build: From 232d9c0e321e6b94c8e012731cddfd19a5e38306 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:31:58 +0500 Subject: [PATCH 5/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e9edbb1b..f2a9a29e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -19,9 +19,9 @@ jobs: git config --global user.name "CI PgPro admin" git clone https://github.com/postgres/postgres.git pg cd pg - git checkout master + git checkout REL_11_STABLE ./configure --prefix=`pwd`/tmp_install git subtree add --prefix=contrib/aqo https://github.com/postgrespro/aqo.git $GITHUB_REF - patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_master.patch + patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg11.patch make -j4 > /dev/null && make -j4 -C contrib > /dev/null make -C contrib/aqo check From 75dd9ae531c2ce5ace8924759fb93bb675573017 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:47:51 +0500 Subject: [PATCH 6/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f2a9a29e..d1da8c77 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -25,3 +25,12 @@ jobs: patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg11.patch make -j4 > /dev/null && make -j4 -C contrib > /dev/null make -C contrib/aqo check + git clean -fdx + + # Test for PG10 + git checkout REL_10_STABLE + ./configure --prefix=`pwd`/tmp_install + git subtree add --prefix=contrib/aqo https://github.com/postgrespro/aqo.git $GITHUB_REF + patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg11.patch + make -j4 > /dev/null && make -j4 -C contrib > /dev/null + make -C contrib/aqo check From 4420c8eaffa6a7309e6adb5ca2a89c7d6fbf6c35 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 15:54:17 +0500 Subject: [PATCH 7/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index d1da8c77..4d3d36b0 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -25,6 +25,8 @@ jobs: patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg11.patch make -j4 > /dev/null && make -j4 -C contrib > /dev/null make -C contrib/aqo check + + git checkout HEAD git clean -fdx # Test for PG10 From ff51482c7a2ab2722d31325afe08632e2aa8b7f7 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 16:13:02 +0500 Subject: [PATCH 8/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 4d3d36b0..555e67d4 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -26,7 +26,7 @@ jobs: make -j4 > /dev/null && make -j4 -C contrib > /dev/null make -C contrib/aqo check - git checkout HEAD + git reset --hard HEAD git clean -fdx # Test for PG10 From aecd33fa0e140aa0c8c074afefe5788ac054a458 Mon Sep 17 00:00:00 2001 From: Andrey Lepikhov Date: Sun, 13 Jun 2021 16:42:06 +0500 Subject: [PATCH 9/9] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 555e67d4..c8ddd971 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: 'C/C++ CI for the stable11' on: push: - branches: [ stable11-ci ] + branches: [ stable11 ] pull_request: - branches: [ stable11-ci ] + branches: [ stable11 ] jobs: build: