From 738cbb7a3e50b5868850393b67cb8edbfe420438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 1 Oct 2024 18:28:58 +0200 Subject: [PATCH 1/3] ci: Use ubuntu-latest instead of hardcoded version after 24.04 is no longer beta --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d236726..90b8cf8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,7 @@ jobs: podman build -f ./podmanfile clang-format-style-check: - # The ubuntu-latest has an old version of clang-format, let's use ubuntu-24.04 which is in Beta - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 From bc611bb9f237a21d78f375121caf143da3c68437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Wed, 8 Jan 2025 09:47:08 +0100 Subject: [PATCH 2/3] ci: Drop no longer needed mono kill after Ubuntu image update --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90b8cf8e..aa00c38e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,13 +228,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Stop Mono and XSP - # These occupy port 8084 unnecessarily - run: | - sudo systemctl stop mono-xsp4.service || true - sudo systemctl disable mono-xsp4.service || true - sudo killall mono || true - sudo killall xsp4 || true - name: Set up JDK 17 uses: actions/setup-java@v4 with: From aebd52db3e16d59f3c5862b3996a004b064d1c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Wed, 8 Jan 2025 09:46:26 +0100 Subject: [PATCH 3/3] ci: Use podman as an underlying docker engine `docker` was removed in the new image, moby-* packages can be used instead as well /etc/containers/nodocker is required for `Emulate Docker CLI using podman` msg to disappear --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa00c38e..7284971d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -236,7 +236,8 @@ jobs: - name: Setup dependencies run: | sudo apt-get update -y - sudo apt-get install -y docker maven git curl iproute2 wcstools + sudo apt-get install -y podman-docker maven git curl iproute2 wcstools + sudo touch /etc/containers/nodocker cd test sh setup-dependencies.sh - name: Print network environment