From 3bed6029eb858f779e2690dc298401f6a7db38ef Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 6 Jun 2025 20:27:49 +0200 Subject: [PATCH 01/12] PG-1486 Add ARM64 builds in CI --- .github/workflows/psp-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/psp-matrix.yml b/.github/workflows/psp-matrix.yml index 635ab9ed78454..211c8a47397a6 100644 --- a/.github/workflows/psp-matrix.yml +++ b/.github/workflows/psp-matrix.yml @@ -11,7 +11,7 @@ jobs: name: PSP strategy: matrix: - os: ['ubuntu-22.04'] + os: [ubuntu-22.04, ubuntu-22.04-arm] compiler: [gcc, clang] build_type: [debugoptimized] build_script: [make, meson] From f958ea1385cefe02517e1e96c9bdc319cda7a080 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 11 Jun 2025 16:33:51 +0200 Subject: [PATCH 02/12] Rework --- .../{psp-reusable.yml => build-and-test.yml} | 10 ++--- .github/workflows/matirx.yml | 41 +++++++++++++++++++ .github/workflows/pgindent.yml | 7 +--- .github/workflows/psp-matrix.yml | 24 ----------- 4 files changed, 47 insertions(+), 35 deletions(-) rename .github/workflows/{psp-reusable.yml => build-and-test.yml} (96%) create mode 100644 .github/workflows/matirx.yml delete mode 100644 .github/workflows/psp-matrix.yml diff --git a/.github/workflows/psp-reusable.yml b/.github/workflows/build-and-test.yml similarity index 96% rename from .github/workflows/psp-reusable.yml rename to .github/workflows/build-and-test.yml index c363deb437221..41af1a40686ba 100644 --- a/.github/workflows/psp-reusable.yml +++ b/.github/workflows/build-and-test.yml @@ -1,4 +1,4 @@ -name: PSP-Reusable +name: Reusable build and test on: workflow_call: inputs: @@ -21,7 +21,7 @@ env: jobs: build: - name: Build PSP + name: Build runs-on: ${{ inputs.os }} steps: - name: Clone repository @@ -50,7 +50,7 @@ jobs: retention-days: 1 test: - name: Test PSP + name: Test runs-on: ${{ inputs.os }} needs: build @@ -93,8 +93,8 @@ jobs: src/src/test/*/tmp_check retention-days: 3 - test_tde: - name: Test PSP with TDE + test-default-tde: + name: Test with TDE as default access method runs-on: ${{ inputs.os }} if: inputs.build_script == 'make' needs: build diff --git a/.github/workflows/matirx.yml b/.github/workflows/matirx.yml new file mode 100644 index 0000000000000..a19f613574d2d --- /dev/null +++ b/.github/workflows/matirx.yml @@ -0,0 +1,41 @@ +name: Build and Test +on: + pull_request: + push: + branches: + - TDE_REL_17_STABLE + workflow_dispatch: + +jobs: + main: + name: Main Build and Test matrix + strategy: + matrix: + os: [ubuntu-22.04] + compiler: [gcc, clang] + build_type: [debugoptimized] + build_script: [make, meson] + uses: ./.github/workflows/psp-reusable.yml + with: + os: ${{ matrix.os }} + compiler: ${{ matrix.compiler }} + build_type: ${{ matrix.build_type }} + build_script: ${{ matrix.build_script }} + secrets: inherit + + arm: + name: ARM Build and Test matix + if: github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-22.04-arm] + compiler: [gcc, clang] + build_type: [debugoptimized] + build_script: [make, meson] + uses: ./.github/workflows/psp-reusable.yml + with: + os: ${{ matrix.os }} + compiler: ${{ matrix.compiler }} + build_type: ${{ matrix.build_type }} + build_script: ${{ matrix.build_script }} + secrets: inherit diff --git a/.github/workflows/pgindent.yml b/.github/workflows/pgindent.yml index c65ee645a8ba2..c1a99c63082e7 100644 --- a/.github/workflows/pgindent.yml +++ b/.github/workflows/pgindent.yml @@ -1,12 +1,8 @@ -name: PgIndent +name: Format on: pull_request: workflow_dispatch: -defaults: - run: - working-directory: ./src - jobs: check: name: Check @@ -15,7 +11,6 @@ jobs: - name: Clone repository uses: actions/checkout@v4 with: - path: 'src' submodules: recursive - name: Install dependencies diff --git a/.github/workflows/psp-matrix.yml b/.github/workflows/psp-matrix.yml deleted file mode 100644 index 211c8a47397a6..0000000000000 --- a/.github/workflows/psp-matrix.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: PSP -on: - pull_request: - push: - branches: - - TDE_REL_17_STABLE - workflow_dispatch: - -jobs: - build: - name: PSP - strategy: - matrix: - os: [ubuntu-22.04, ubuntu-22.04-arm] - compiler: [gcc, clang] - build_type: [debugoptimized] - build_script: [make, meson] - uses: ./.github/workflows/psp-reusable.yml - with: - os: ${{ matrix.os }} - compiler: ${{ matrix.compiler }} - build_type: ${{ matrix.build_type }} - build_script: ${{ matrix.build_script }} - secrets: inherit From 007002427acacbf38be046655611d06980a9f242 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 11 Jun 2025 17:01:13 +0200 Subject: [PATCH 03/12] Fix --- .github/workflows/matirx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/matirx.yml b/.github/workflows/matirx.yml index a19f613574d2d..613132892883b 100644 --- a/.github/workflows/matirx.yml +++ b/.github/workflows/matirx.yml @@ -15,7 +15,7 @@ jobs: compiler: [gcc, clang] build_type: [debugoptimized] build_script: [make, meson] - uses: ./.github/workflows/psp-reusable.yml + uses: ./.github/workflows/build-and-test.yml with: os: ${{ matrix.os }} compiler: ${{ matrix.compiler }} @@ -32,7 +32,7 @@ jobs: compiler: [gcc, clang] build_type: [debugoptimized] build_script: [make, meson] - uses: ./.github/workflows/psp-reusable.yml + uses: ./.github/workflows/build-and-test.yml with: os: ${{ matrix.os }} compiler: ${{ matrix.compiler }} From 979b99fd810a39656d11baac3342d6a443664bab Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 11 Jun 2025 17:07:27 +0200 Subject: [PATCH 04/12] Rename --- .github/workflows/matirx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/matirx.yml b/.github/workflows/matirx.yml index 613132892883b..86ad984050bd1 100644 --- a/.github/workflows/matirx.yml +++ b/.github/workflows/matirx.yml @@ -8,7 +8,7 @@ on: jobs: main: - name: Main Build and Test matrix + name: Main matrix strategy: matrix: os: [ubuntu-22.04] @@ -24,7 +24,7 @@ jobs: secrets: inherit arm: - name: ARM Build and Test matix + name: ARM matrix if: github.event_name != 'pull_request' strategy: matrix: From a3592ac7ad4df5fe641b45667d940e9b42e26740 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 11 Jun 2025 17:39:47 +0200 Subject: [PATCH 05/12] Try slack notification --- .github/workflows/build-and-test.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 41af1a40686ba..fd9c14c76f65f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -137,3 +137,22 @@ jobs: src/src/test/*/results src/src/test/*/tmp_check retention-days: 3 + + slack-notification: + #if: ${{ failure() }} + #needs: [ test, test-default-tde ] + name: Slack Notification on CI failure + runs-on: ubuntu-22.04 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_TOKEN_PMM_CI }} + SLACK_CHANNEL: "pmm-ci" + + steps: + - name: Post + uses: slackapi/slack-github-action@v2.1.0 + with: + method: chat.postMessage + token: ${{ secrets.SLACK_TOKEN_PMM_CI }} + payload: | + channel: postgresql-test + text: "howdy !" From 2e74905c1e225791378838376d5b59d60f2bee19 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 16:33:30 +0200 Subject: [PATCH 06/12] Try slack notification --- .github/workflows/build-and-test.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fd9c14c76f65f..135c624c40565 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -139,20 +139,15 @@ jobs: retention-days: 3 slack-notification: - #if: ${{ failure() }} - #needs: [ test, test-default-tde ] - name: Slack Notification on CI failure - runs-on: ubuntu-22.04 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_TOKEN_PMM_CI }} - SLACK_CHANNEL: "pmm-ci" - + # if: ${{ failure() }} + needs: [ test, test-default-tde ] + name: Slack Notification + runs-on: ubuntu-24.04 steps: - - name: Post - uses: slackapi/slack-github-action@v2.1.0 - with: - method: chat.postMessage - token: ${{ secrets.SLACK_TOKEN_PMM_CI }} - payload: | - channel: postgresql-test - text: "howdy !" + - name: Greet the reader + uses: slackapi/slack-github-action@v2.1.0 + with: + webhook: ${{ secrets.SLACK_WEBHOOK_URL }} + webhook-type: incoming-webhook + payload: | + text: "Hello world!" From f588ba90b22b6293a5b0c4376d53ca2a2b72ae4e Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 17:55:59 +0200 Subject: [PATCH 07/12] Try message formatting --- .github/workflows/build-and-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 135c624c40565..a95108173ff10 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -139,7 +139,7 @@ jobs: retention-days: 3 slack-notification: - # if: ${{ failure() }} + if: ${{ failure() }} needs: [ test, test-default-tde ] name: Slack Notification runs-on: ubuntu-24.04 @@ -151,3 +151,8 @@ jobs: webhook-type: incoming-webhook payload: | text: "Hello world!" + blocks: + - type: "section" + text: + - type "mrkdown" + text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" From b0b312ef7f13535670c95fd608293edd172926aa Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 17:56:38 +0200 Subject: [PATCH 08/12] Debug --- .github/workflows/build-and-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a95108173ff10..bc0e01bb2f4fa 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -31,6 +31,9 @@ jobs: submodules: recursive ref: ${{ github.ref }} + - name: debug + run: exit 1 + - name: Install dependencies run: src/ci_scripts/ubuntu-deps.sh From f9843a8b95b2606988a2b8ee500a7ed8c1ef3e0a Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 17:59:03 +0200 Subject: [PATCH 09/12] Fix --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index bc0e01bb2f4fa..779791d8fa038 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -157,5 +157,5 @@ jobs: blocks: - type: "section" text: - - type "mrkdown" - text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" + type "mrkdown" + text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" From be1dd11fbc86a8bce418683417ee2369d8890919 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 18:00:27 +0200 Subject: [PATCH 10/12] Fix --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 779791d8fa038..61255f0e6ccc6 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -157,5 +157,5 @@ jobs: blocks: - type: "section" text: - type "mrkdown" + type: "mrkdown" text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" From e2a46f61395d517ea96be8f92194797560c38e37 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 18:08:27 +0200 Subject: [PATCH 11/12] Try --- .github/workflows/build-and-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 61255f0e6ccc6..a5322a3c785a1 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -153,9 +153,9 @@ jobs: webhook: ${{ secrets.SLACK_WEBHOOK_URL }} webhook-type: incoming-webhook payload: | - text: "Hello world!" - blocks: - - type: "section" - text: - type: "mrkdown" - text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" + text: "${GITHUB_WORKFLOW} failed!" + # blocks: + # - type: "section" + # text: + # type: "mrkdown" + # text: "Workflow ${GITHUB_WORKFLOW} failed on commit ${GITHUB_SHA}\n\n<${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}|View logs>" From fdd1c538776d38a42ef9c6b9607a17fff7313828 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 13 Jun 2025 18:09:31 +0200 Subject: [PATCH 12/12] Try --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a5322a3c785a1..755b4a45e954f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -153,7 +153,7 @@ jobs: webhook: ${{ secrets.SLACK_WEBHOOK_URL }} webhook-type: incoming-webhook payload: | - text: "${GITHUB_WORKFLOW} failed!" + text: "${{GITHUB_WORKFLOW}} failed!" # blocks: # - type: "section" # text: