Skip to content
This repository has been archived by the owner on Aug 6, 2024. It is now read-only.

revert crun workaround #29

Closed
wants to merge 3 commits into from
Closed

revert crun workaround #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ad92a
gh-action: Removal of custom crun binary, Image
mxmxchere Aug 6, 2024
ebd8007
gh-action: Removal of custom crun binary, Repo
mxmxchere Aug 6, 2024
c03f296
gh-action: Removal of custom crun binary, SysExts
mxmxchere Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions .github/workflows/image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/sysexts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading