From 3a93edb68fc06f83f9aedcb9c0d3179c211651e3 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 7 May 2025 21:48:48 -0700 Subject: [PATCH 1/3] ci/gha: fix exclusion rules Commit 874207492 neglects to update the exclusion rules when bumping Go releases, and so we no longer exclude running on actuated with older Go release, or running with criu-dev with older Go release. Fixes: 874207492 ("CI: add Go 1.24, drop go1.22") Signed-off-by: Kir Kolyshkin (cherry picked from commit 0628b1e5a0d909627594f4e2df20a8e4ee57e51c) Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe0f27731..09c822199 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,12 +32,12 @@ jobs: # Disable most of criu-dev jobs, as they are expensive # (need to compile criu) and don't add much value/coverage. - criu: criu-dev - go-version: 1.22.x + go-version: 1.23.x - criu: criu-dev rootless: rootless - criu: criu-dev race: -race - - go-version: 1.22.x + - go-version: 1.23.x os: actuated-arm64-6cpu-8gb - race: "-race" os: actuated-arm64-6cpu-8gb From 24537420cadc5c885f6926dee755fe21ec05f904 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 7 May 2025 21:56:16 -0700 Subject: [PATCH 2/3] ci/gha: allow to run jobs manually ... or from another job. Signed-off-by: Kir Kolyshkin (cherry picked from commit 9d970f1dfb890e8c28f1cec7ad58cf414fab3684) Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 1 + .github/workflows/validate.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 09c822199..63b173c1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,7 @@ on: - main - release-* pull_request: + workflow_dispatch: permissions: contents: read diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 18b147b51..a1ad2217d 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -7,6 +7,7 @@ on: - main - release-* pull_request: + workflow_dispatch: env: GO_VERSION: 1.24 permissions: From 34fd5f0e9f9723fd4ae36ce7cdabc9dc43c33181 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 7 May 2025 20:21:22 -0700 Subject: [PATCH 3/3] gha/ci: allow validate/all-done to succeed for non-PRs When we run CI not on a pull request, the commit job is skipped, as a result, all-done is also skipped. To allow all-done to succeed, modify the commit job to succeed for non-PRs. Signed-off-by: Kir Kolyshkin (cherry picked from commit 43955a0d28b1f8748ddcc3fcb65fbbf3d2d52d27) Signed-off-by: Kir Kolyshkin --- .github/workflows/validate.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a1ad2217d..faa7f1f8b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -152,21 +152,24 @@ jobs: contents: read pull-requests: read runs-on: ubuntu-24.04 - # Only check commits on pull requests. - if: github.event_name == 'pull_request' steps: - name: get pr commits + if: github.event_name == 'pull_request' # Only check commits on pull requests. id: 'get-pr-commits' uses: tim-actions/get-pr-commits@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} - name: check subject line length + if: github.event_name == 'pull_request' # Only check commits on pull requests. uses: tim-actions/commit-message-checker-with-regex@v0.3.2 with: commits: ${{ steps.get-pr-commits.outputs.commits }} pattern: '^.{0,72}(\n.*)*$' error: 'Subject too long (max 72)' + - name: succeed (not a PR) + if: github.event_name != 'pull_request' + run: echo "Nothing to check here." cfmt: runs-on: ubuntu-24.04