Skip to content

Commit

Permalink
ci(github): update workflows to use ubuntu-24.04 runners (backport of #…
Browse files Browse the repository at this point in the history
…12251) (#12294)

Automatic cherry-pick of #12251 for branch release-2.6

Generated by
[action](https://github.com/kumahq/kuma/actions/runs/12369092258)

cherry-picked commit 79dbcee
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!
⚠️ ⚠️ ⚠️
```
On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit 79dbcee.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/codeql.yaml
	modified:   .github/workflows/pr-comments.yaml
	modified:   .github/workflows/pr-merged.yaml
	modified:   .github/workflows/scorecard.yml
	modified:   .github/workflows/transparentproxy-tests.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/_build_publish.yaml
	deleted by us:   .github/workflows/_test.yaml
	both modified:   .github/workflows/auto-merge.yaml
	both modified:   .github/workflows/bom.yaml
	both modified:   .github/workflows/build-test-distribute.yaml
	both modified:   .github/workflows/check.yaml
	deleted by us:   .github/workflows/ci-stability.yaml
	deleted by us:   .github/workflows/merge-release-to-master.yaml
	both modified:   .github/workflows/release.yaml
	both modified:   .github/workflows/update-docs.yaml
	both modified:   .github/workflows/update-insecure-dependencies.yaml

```

---------

Signed-off-by: Bart Smykla <[email protected]>
Co-authored-by: Bart Smykla <[email protected]>
  • Loading branch information
kumahq[bot] and bartsmykla authored Dec 17, 2024
1 parent a140801 commit e8a02b2
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read
jobs:
backport_label:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
issues: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
contents: read
jobs:
approve-and-auto-merge:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: contains(github.event.pull_request.labels.*.name, 'ci/auto-merge')
permissions:
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
permissions: read-all
jobs:
sbom:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-test-distribute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
jobs:
check:
timeout-minutes: 25
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: "Fail when 'ci/force-publish' label is present on PRs from forks"
if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci/force-publish') && github.event.pull_request.head.repo.full_name != github.repository }}
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- run: |
make check
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'ci/skip-test') }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:
GH_TOKEN: ${{ steps.github-app-token.outputs.token }}
run: make helm/release
gen_e2e_matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci/skip-test') && !contains(github.event.pull_request.labels.*.name, 'ci/skip-e2e-test') }}
outputs:
matrix: ${{ steps.generate-matrix.outputs.matrix }}
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
with:
matrix: ${{ toJSON(matrix) }}
# can't use env here, make sure change other copies when making changes
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-24.04","arm64":""}' }}
test_e2e_env:
needs: ["gen_e2e_matrix"]
if: fromJSON(needs.gen_e2e_matrix.outputs.matrix).test_e2e_env
Expand All @@ -284,4 +284,4 @@ jobs:
with:
matrix: ${{ toJSON(matrix) }}
# can't use env here, make sure change other copies when making changes
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-24.04","arm64":""}' }}
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# for more info. We have "Default to PR title for squash merge commits" enabled.
commit-lint:
name: "Check PR title"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: read
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
runnersByArch:
type: string
required: false
default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}'
default: '{"amd64": "ubuntu-24.04", "arm64": "ubuntu-latest-arm64-kong"}'
permissions:
contents: read
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
pr_comments:
if: github.event.issue.pull_request != '' && (contains(github.event.comment.body, '/format') || contains(github.event.comment.body, '/golden_files'))
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Generate GitHub app token
id: github-app-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-merged.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
notify-about-merged-pr:
if: github.event_name != 'pull_request_target' || github.event.pull_request.merged
name: "Notify about merged PR"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: "Send repository dispatch event"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ permissions:
contents: read
jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions: read-all
jobs:
analysis:
name: Scorecard analysis
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/transparentproxy-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:
contents: read
jobs:
generate-docs:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-insecure-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
permissions: read-all
jobs:
build-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
branches: ${{ steps.generate-matrix.outputs.branches }}
steps:
Expand All @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
branch: ${{ fromJSON(needs.build-matrix.outputs.branches) }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Set Swap Space
uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c
Expand Down

0 comments on commit e8a02b2

Please sign in to comment.