From f82fd6141565280b3cf1d4b36a8443c4b728abb6 Mon Sep 17 00:00:00 2001 From: Jonathan Giannuzzi Date: Mon, 10 Jun 2024 12:48:27 +0100 Subject: [PATCH 1/3] Use pagination to list jobs in check-required workflow (#458) --- .github/workflows/check-required.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-required.yml b/.github/workflows/check-required.yml index 429767d9..a3a7df17 100644 --- a/.github/workflows/check-required.yml +++ b/.github/workflows/check-required.yml @@ -24,12 +24,12 @@ jobs: with: script: | // list jobs for worklow run attempt - const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRunAttempt({ + const { data: { jobs } } = await github.paginate(github.rest.actions.listJobsForWorkflowRunAttempt({ owner: context.payload.repository.owner.login, repo: context.payload.repository.name, run_id: context.payload.workflow_run.id, attempt_number: context.payload.workflow_run.run_attempt, - }); + })); // check if required job was successful var success = false; core.info(`Checking jobs for workflow run ${context.payload.workflow_run.html_url}`); From 6b85a4a1597f914aa40a7622e16a94e3f3148d1a Mon Sep 17 00:00:00 2001 From: Jonathan Giannuzzi Date: Mon, 10 Jun 2024 13:29:44 +0100 Subject: [PATCH 2/3] Use a newer version of curl in the CentOS 7 container to fix vcpkg cache (#459) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00fcef43..f32e6dba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: run: | docker run -d --name centos --entrypoint tail -v $PWD:$PWD -v $VCPKG_INSTALLATION_ROOT:$VCPKG_INSTALLATION_ROOT centos:7 -f /dev/null docker exec centos sh -c "yum install -y centos-release-scl epel-release && \ - yum install -y devtoolset-7 rh-git227 flex bison perl-Data-Dumper perl-IPC-Cmd && \ + yum install -y devtoolset-7 rh-git227 httpd24-curl flex bison perl-Data-Dumper perl-IPC-Cmd && \ curl -fsSL -o /tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${{ steps.cmake-info.outputs.version }}/cmake-${{ steps.cmake-info.outputs.version }}-linux-x86_64.sh && \ sh /tmp/cmake.sh --skip-license --prefix=/usr/local && \ rm /tmp/cmake.sh" @@ -138,7 +138,7 @@ jobs: if: runner.os == 'Linux' || runner.os == 'macOS' run: | if [ "${{ runner.os }}" == "Linux" ] && [ "${{ matrix.arch }}" == "x64" ]; then - exec="docker exec -w $PWD -e GITHUB_ACTIONS -e ACTIONS_CACHE_URL -e ACTIONS_RUNTIME_TOKEN -e VCPKG_BINARY_SOURCES -e VCPKG_INSTALLATION_ROOT centos scl enable devtoolset-7 rh-git227 --" + exec="docker exec -w $PWD -e GITHUB_ACTIONS -e ACTIONS_CACHE_URL -e ACTIONS_RUNTIME_TOKEN -e VCPKG_BINARY_SOURCES -e VCPKG_INSTALLATION_ROOT centos scl enable devtoolset-7 rh-git227 httpd24 --" fi $exec ./build_unix.sh ${{ matrix.arch }} env: From 129feaac4cdc3da54d23e77105040bbcb002f805 Mon Sep 17 00:00:00 2001 From: Jonathan Giannuzzi Date: Mon, 10 Jun 2024 14:18:26 +0100 Subject: [PATCH 3/3] Fix check-required pagination usage (#460) --- .github/workflows/check-required.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-required.yml b/.github/workflows/check-required.yml index a3a7df17..4b762ef8 100644 --- a/.github/workflows/check-required.yml +++ b/.github/workflows/check-required.yml @@ -24,12 +24,12 @@ jobs: with: script: | // list jobs for worklow run attempt - const { data: { jobs } } = await github.paginate(github.rest.actions.listJobsForWorkflowRunAttempt({ + const jobs = await github.paginate(github.rest.actions.listJobsForWorkflowRunAttempt, { owner: context.payload.repository.owner.login, repo: context.payload.repository.name, run_id: context.payload.workflow_run.id, attempt_number: context.payload.workflow_run.run_attempt, - })); + }); // check if required job was successful var success = false; core.info(`Checking jobs for workflow run ${context.payload.workflow_run.html_url}`);