diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index d199168..914bcd8 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -12,30 +12,6 @@ jobs: arch: [ amd64, arm64 ] steps: - uses: actions/checkout@v4 - # 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" - curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64 - GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af - - 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 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Build the image @@ -60,30 +36,6 @@ jobs: platform: [ kvm, metal ] steps: - uses: actions/checkout@v4 - # 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" - curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64 - GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af - - 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 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Configure Build Variant diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml index 2780105..c99557b 100644 --- a/.github/workflows/repo.yml +++ b/.github/workflows/repo.yml @@ -16,30 +16,6 @@ jobs: arch: [ amd64, arm64 ] steps: - uses: actions/checkout@v4 - # 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" - curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64 - GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af - - 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 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Build the repo @@ -64,30 +40,6 @@ jobs: platform: [ kvm, metal ] steps: - uses: actions/checkout@v4 - # 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" - curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64 - GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af - - 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 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Configure Build Variant diff --git a/.github/workflows/sysexts.yml b/.github/workflows/sysexts.yml index e890d78..ea54459 100644 --- a/.github/workflows/sysexts.yml +++ b/.github/workflows/sysexts.yml @@ -12,30 +12,6 @@ jobs: arch: [ x86-64, arm64 ] steps: - uses: actions/checkout@v4 - # 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" - curl -Lo ./crun https://github.com/containers/crun/releases/download/1.14.3/crun-1.14.3-linux-amd64 - GOOD_SHA=80c5ab9422d4672f650f2bad3da933568349b64117d055486abc3534517be2af - - 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 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Setup mkosi