Skip to content

Commit

Permalink
Merge pull request #5469 from twz123/ubuntu-24-runners
Browse files Browse the repository at this point in the history
Bump Ubuntu runners to 24.04
  • Loading branch information
twz123 authored Jan 23, 2025
2 parents b042db0 + 2ae7425 commit 9a8f183
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
&& startsWith(github.event.label.name, 'backport/')
)
)
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-airgap-image-bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
jobs:
build:
name: "${{ inputs.target-os }}-${{ inputs.target-arch }}"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
TARGET_OS: ${{ inputs.target-os }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
build:
name: Build docs
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout k0s
uses: actions/checkout@v4
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:

dev-container:
name: Build docs dev container
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout k0s
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-k0s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
${{
inputs.target-arch == 'arm' && fromJSON('["self-hosted", "linux", "arm"]')
|| inputs.target-arch == 'arm64' && fromJSON('["self-hosted", "linux", "arm64"]')
|| 'ubuntu-22.04'
|| 'ubuntu-24.04'
}}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

name: "K8s Network Conformance Testing"
if: github.repository == 'k0sproject/k0s'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
k0s_version: ${{ steps.bin_info.outputs.K0S_VERSION }}
kubernetes_version: ${{ steps.k0s_build.outputs.KUBERNETES_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
check_for_merge_commit:
name: mergeable
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Run git checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conflicts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:

jobs:
main:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Check for merge conflicts
uses: eps1lon/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dco.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
check:
name: DCO check
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout k0s
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-prs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
auto-merge:
name: Auto-merge version updates
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Fetch Dependabot metadata
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
jobs:
lint:
name: Lint markdown
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: articulate/actions-markdownlint@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
jobs:
prepare:
name: Prepare
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

outputs:
smoketest-matrix: ${{ steps.generate-smoketest-matrix.outputs.smoketests }}
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
name: "Build :: SBOM"
needs: [build-k0s]

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Check out code into the Go module directory
Expand All @@ -122,7 +122,7 @@ jobs:
matrix:
include:
- name: linux-amd64
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
- name: windows-amd64
runs-on: windows-2022
target-os: windows
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
jobs:
lint:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
validate-os-tests:
name: Validate OS tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
TERRAFORM_VERSION: 1.4.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ostests-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ env:
jobs:
e2e-tests:
name: e2e tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
E2E_FOCUS: ${{ inputs.e2e-focus }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ostests-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
jobs:
select:
name: Select
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

outputs:
os: ${{ steps.select.outputs.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
build:
name: Deploy docs
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout k0s main
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
build:
name: Deploy docs
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout k0s
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
TF_VAR_k0s_binary_path: "${{ github.workspace }}/k0s"
KUBECONFIG: ${{ github.workspace }}/kubeconfig
name: release
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
tag_name: ${{ steps.branch_name.outputs.TAG_NAME }}
Expand Down Expand Up @@ -425,7 +425,7 @@ jobs:
- x64
- arm64
- armv7
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Download assets for generating checksums
uses: robinraju/[email protected]
Expand All @@ -452,7 +452,7 @@ jobs:
- x64
- arm64
- armv7
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down Expand Up @@ -512,7 +512,7 @@ jobs:
sbom:
needs:
- release
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Run git checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
KUBECONFIG: ${{ github.workspace }}/kubeconfig

name: "K8s Conformance Testing"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
defaults:
run:
working-directory: ./inttest/sonobuoy/terraform
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sbom-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:

jobs:
sbom-upload:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
id-token: write
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoketest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ permissions:
jobs:
smoketest:
name: ${{ inputs.job-name }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/stale@v9
with:
Expand Down

0 comments on commit 9a8f183

Please sign in to comment.