From a3a6df2d288d9f533ab3b07515ab1ddff83aa568 Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Thu, 24 Aug 2023 17:56:35 +0300 Subject: [PATCH 1/6] Additional configuration for codecov --- .github/actions/upload_coverage/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml index 71305cb2d41..ba318c5caff 100644 --- a/.github/actions/upload_coverage/action.yml +++ b/.github/actions/upload_coverage/action.yml @@ -8,6 +8,8 @@ runs: - uses: codecov/codecov-action@v3 with: flags: ${{ inputs.flags }} + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true - name: Create codeclimate coverage run: |- lcov --directory . --capture --output-file lcov.info From f961ed80fe2bbc296309fe3a660527301945d2b2 Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Thu, 24 Aug 2023 17:56:45 +0300 Subject: [PATCH 2/6] Remove run-name for build task --- .github/workflows/build_and_test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 888c80af74a..e3387d5148f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,5 @@ name: Build & Test -run-name: Build & Test - ${{ github.event.pull_request.number || github.ref_name }} - ${{ github.sha }} +run-name: Build & Test - ${{ github.event_name }} ${{ github.event.pull_request.number || github.ref_name }} concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true @@ -195,10 +195,8 @@ jobs: with: count: 6 test-arbitrary-configs: - if: ${{ false }} - # disable this job till we have 16core VMs name: PG${{ matrix.pg_version }} - regress - check-arbitrary-configs - runs-on: ubuntu-latest #-16core + runs-on: ubuntu-latest #-16core - we need 16 cores VMs to run this job successfully container: image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ vars.image_suffix }}" options: --user root From 5c5375e5ff5be4b20a60c7e600cd32a057126a8c Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Fri, 25 Aug 2023 12:56:04 +0300 Subject: [PATCH 3/6] Fix secrets access in a composite action --- .github/actions/upload_coverage/action.yml | 4 +++- .github/workflows/build_and_test.yml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml index ba318c5caff..dcf2bb8589d 100644 --- a/.github/actions/upload_coverage/action.yml +++ b/.github/actions/upload_coverage/action.yml @@ -2,13 +2,15 @@ name: coverage inputs: flags: required: false + codecov_token: + required: true runs: using: composite steps: - uses: codecov/codecov-action@v3 with: flags: ${{ inputs.flags }} - token: ${{ secrets.CODECOV_TOKEN }} + token: ${{ inputs.codecov_token }} verbose: true - name: Create codeclimate coverage run: |- diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e3387d5148f..cbb24c80a46 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -182,6 +182,7 @@ jobs: if: always() with: flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }} + codecov_token: ${{ secrets.CODECOV_TOKEN }} prepare_parallelization_matrix_6: name: Parallel 6 runs-on: ubuntu-latest @@ -231,6 +232,7 @@ jobs: if: always() with: flags: ${{ env.pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} test-pg-upgrade: runs-on: ubuntu-latest container: @@ -272,6 +274,7 @@ jobs: if: always() with: flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} test-citus-upgrade: runs-on: ubuntu-latest container: @@ -314,6 +317,7 @@ jobs: if: always() with: flags: ${{ env.pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} upload-coverage: if: always() env: From 752eaff7169674437ca0f22e23155f4647324422 Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Fri, 25 Aug 2023 14:09:39 +0300 Subject: [PATCH 4/6] Better naming work build and test --- .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 cbb24c80a46..75548b3a6c0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,5 @@ name: Build & Test -run-name: Build & Test - ${{ github.event_name }} ${{ github.event.pull_request.number || github.ref_name }} +run-name: Build & Test - ${{ github.event_name }} ${{ github.event.pull_request.title || github.ref_name }} concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 142a63148af4de4c5889b6eab0065f142df2311b Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Fri, 25 Aug 2023 14:09:49 +0300 Subject: [PATCH 5/6] enable gcov --- .github/actions/upload_coverage/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml index dcf2bb8589d..0b5f581a6a4 100644 --- a/.github/actions/upload_coverage/action.yml +++ b/.github/actions/upload_coverage/action.yml @@ -12,6 +12,7 @@ runs: flags: ${{ inputs.flags }} token: ${{ inputs.codecov_token }} verbose: true + gcov: true - name: Create codeclimate coverage run: |- lcov --directory . --capture --output-file lcov.info From 82c97a033c26970424734c7dee51cb0169ea23f2 Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Mon, 28 Aug 2023 09:18:37 +0300 Subject: [PATCH 6/6] Renaming Naming improvements --- .../action.yml | 2 +- .github/workflows/build_and_test.yml | 14 +++++++------- .github/workflows/flaky_test_debugging.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename .github/actions/{install_extension => setup_extension}/action.yml (97%) diff --git a/.github/actions/install_extension/action.yml b/.github/actions/setup_extension/action.yml similarity index 97% rename from .github/actions/install_extension/action.yml rename to .github/actions/setup_extension/action.yml index 7a81e764302..96b408e7e43 100644 --- a/.github/actions/install_extension/action.yml +++ b/.github/actions/setup_extension/action.yml @@ -1,4 +1,4 @@ -name: install_extension +name: setup_extension inputs: pg_major: required: false diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 75548b3a6c0..c48d6ff1c1e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,5 @@ name: Build & Test -run-name: Build & Test - ${{ github.event_name }} ${{ github.event.pull_request.title || github.ref_name }} +run-name: Build & Test - ${{ github.event.pull_request.title || github.ref_name }} concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true @@ -170,7 +170,7 @@ jobs: - build steps: - uses: actions/checkout@v3.5.0 - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" - name: Run Test run: gosu circleci make -C src/test/${{ matrix.suite }} ${{ matrix.make }} timeout-minutes: 20 @@ -215,7 +215,7 @@ jobs: parallel: [1,2,3,4,5,6] steps: - uses: actions/checkout@v3.5.0 - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" - name: Test arbitrary configs run: |- TESTS=$(src/test/regress/citus_tests/print_test_names.py) @@ -248,10 +248,10 @@ jobs: - uses: actions/download-artifact@v3.0.1 with: path: "." - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" with: pg_major: "${{ env.old_pg_major }}" - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" with: pg_major: "${{ env.new_pg_major }}" - name: Install and test postgres upgrade @@ -284,7 +284,7 @@ jobs: - build steps: - uses: actions/checkout@v3.5.0 - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" with: skip_installation: true - name: Install and test citus upgrade @@ -431,7 +431,7 @@ jobs: steps: - uses: actions/checkout@v3.5.0 - uses: actions/download-artifact@v3.0.1 - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" - name: Run minimal tests run: |- tests="${{ needs.test-flakyness-pre.outputs.tests }}" diff --git a/.github/workflows/flaky_test_debugging.yml b/.github/workflows/flaky_test_debugging.yml index 708c9bb1a11..a666c1cd5df 100644 --- a/.github/workflows/flaky_test_debugging.yml +++ b/.github/workflows/flaky_test_debugging.yml @@ -68,7 +68,7 @@ jobs: matrix: ${{ fromJson(needs.prepare_parallelization_matrix.outputs.json) }} steps: - uses: actions/checkout@v3.5.0 - - uses: "./.github/actions/install_extension" + - uses: "./.github/actions/setup_extension" - name: Run minimal tests run: |- gosu circleci src/test/regress/citus_tests/run_test.py ${{ env.test }} --repeat ${{ env.runs }} --use-base-schedule --use-whole-schedule-line