gh-actions: Remove Ubuntu 22.04 crun workaround (gardenlinux#2242)

* gh-action: remove obsolete crun workaround Signed-off-by: Malte Münch <muench@b1-systems.de> * gh-action: remove obsolete crun workaround comments Signed-off-by: Malte Münch <muench@b1-systems.de> --------- Signed-off-by: Malte Münch <muench@b1-systems.de>
kshtsk · Aug 5, 2024 · 54ec1b3 · 54ec1b3
1 parent 4ca408d
commit 54ec1b3
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -23,32 +23,3 @@ runs:
           mkdir -p "$HOME/.config/containers"
           echo 'unqualified-search-registries = ["docker.io"]' > "$HOME/.config/containers/registries.conf"
         fi
-    # Workaround for https://github.com/actions/runner-images/issues/9425, to be removed once the issue is resolved
-    - name: patch crun (Workaround for https://github.com/actions/runner-images/issues/9425)
-      run: |
-        tmpdir="$(mktemp -d)"
-        pushd "$tmpdir"
-        if [ "${{ inputs.arch }}" = "amd64" ]; then
-          curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64
-          GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af
-        elif [ "${{ inputs.arch }}" = "arm64" ]; then
-          curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-arm64
-          GOOD_SHA=0486629e1599c3bccded279f6555ff22691958cde56203ceca099af6f2407263
-        fi
-
-        sha256sum ./crun
-        OUR_SHA=$(sha256sum ./crun | awk '{ print $1 }')
-
-        if [[ "$GOOD_SHA" == "$OUR_SHA" ]]; then
-            sudo install crun /usr/bin/crun
-        else
-            echo "Checksums do not match"
-            exit 1
-        fi
-        popd
-        rm -rf "$tmpdir"
-      shell: bash
-    - name: Show crun version after the patch
-      shell: bash
-      run: |
-        crun --version
diff --git a/.github/workflows/lima.yaml b/.github/workflows/lima.yaml
@@ -42,7 +42,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.version }}
-      # Workaround for crun version, cf https://github.com/gardenlinux/gardenlinux/pull/1982
       - uses: ./.github/actions/setup
       - name: Build the image
         run: ./build ${{ needs.collect-metadata.outputs.CNAME }}-${{ matrix.arch }}

diff --git a/.github/workflows/stig.yaml b/.github/workflows/stig.yaml
@@ -16,7 +16,6 @@ jobs:
         platform: [ kvm, aws, azure, ali, gcp, metal ]
     steps:
       - uses: actions/checkout@v4
-      # Workaround for crun version, cf https://github.com/gardenlinux/gardenlinux/pull/1982
       - uses: ./.github/actions/setup
       - name: Build the image
         run: ./build ${{ matrix.platform}}-stig

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -65,7 +65,6 @@ jobs:
             target: ali
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # pin@v4.1.1
-      # Use crun workaround
     - uses: ./.github/actions/setup
 
     - name: login to ghcr.io