Skip to content

Commit

Permalink
Bump Ubuntu action runner to 24.04 (#592)
Browse files Browse the repository at this point in the history
* Bump Ubuntu action runner to 24.04

* Remove outdated workaround to update old podman in ubuntu

* Bump base image
  • Loading branch information
kachick authored May 15, 2024
1 parent 351c1c2 commit 0860743
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-latest
- ubuntu-24.04
- macos-14 # M1 - https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
- windows-latest
runs-on: ${{ matrix.os }}
Expand All @@ -40,7 +40,7 @@ jobs:
- run: go test ./...
- run: go build -v -race ./...
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-home.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-14 # M1 - https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
# Disabled macOS-13 because the runner is too slow.
# I have Intel Mac, but it have latest darwin. So only testing in ubuntu runner and macos-14 runner is enough.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-latest
- ubuntu-24.04
- macos-14 # M1 - https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
runs-on: ${{ matrix.os }}
timeout-minutes: 30
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
ghcr:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
- uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cleanup-staging-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defaults:

jobs:
get-meta:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
pr-number: ${{ steps.get-meta.outputs.pr-number }}
Expand All @@ -37,7 +37,7 @@ jobs:
pr-number: ${{ fromJSON(needs.get-meta.outputs.pr-number) }}
ghcr:
needs: [get-meta]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: (github.event_name != 'pull_request') || (github.event.pull_request.merged == true)
timeout-minutes: 15
steps:
Expand Down
22 changes: 2 additions & 20 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
# podman can handle lowercase. So normalize the outputs
get-meta:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
started_at: ${{ steps.timestamp.outputs.started_at }}
Expand Down Expand Up @@ -76,27 +76,9 @@ jobs:
(! failure()) &&
((github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy-staging')) ||
(github.event_name != 'pull_request'))
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 60
steps:
- name: Logging initial dependency versions
run: |
podman version
crun --version
buildah version
- name: |
Update podman and buildah with kubic to avoid and prevent following issues
* https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
* https://github.com/containers/buildah/issues/4632
* https://github.com/containers/podman/issues/14065
# https://podman.io/docs/installation#ubuntu
run: |
# https://github.com/containers/podman/issues/14302#issuecomment-1564806361
# https://software.opensuse.org//download.html?project=devel%3Akubic%3Alibcontainers%3Aunstable&package=podman
echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list
curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
sudo apt-get update
sudo apt-get -y install podman buildah
- name: Logging dependency versions
run: |
podman version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
gitleaks:
timeout-minutes: 15
name: gitleaks
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
dprint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
Expand All @@ -17,7 +17,7 @@ jobs:

typos:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: crate-ci/[email protected] # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["typos", "--version"], "nth": 2}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/merge-bot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
jobs:
judge-dependabot:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
merge: ${{ steps.conclusion.outputs.merge }}
if: ${{ github.actor == 'dependabot[bot]' }}
Expand All @@ -28,7 +28,7 @@ jobs:
needs: [judge-dependabot]
if: ${{ needs.judge-dependabot.outputs.merge == 'true' }}
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Dependabot metadata
id: metadata
Expand All @@ -53,7 +53,7 @@ jobs:
# Changing in all personal repository is annoy task for me. Even if using terrafform, getting mandatory CI names in each repo is too annoy!
renovate:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor == 'renovate[bot]' }}
steps:
- name: Wait other jobs
Expand All @@ -70,7 +70,7 @@ jobs:
# https://github.com/kachick/anylang-template/issues/51
selfup-runner:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor == 'selfup-runner[bot]' }}
steps:
- name: Wait other jobs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/minimize-staging-deploy-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
minimize:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
# Need checkout before using gh and repo placeholders
Expand Down
2 changes: 1 addition & 1 deletion containers/Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://github.com/kachick/containers
FROM ghcr.io/kachick/ubuntu-24.04-nix-systemd:20240508-173739-utc
FROM ghcr.io/kachick/ubuntu-24.04-nix-systemd:20240515-154517-utc

LABEL org.opencontainers.image.source=https://github.com/kachick/dotfiles
LABEL org.opencontainers.image.description="Example by kachick/dotfiles"
Expand Down

0 comments on commit 0860743

Please sign in to comment.