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

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
fwilhe authored Mar 14, 2024
1 parent 4e36267 commit 084edb2
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 10 deletions.
62 changes: 58 additions & 4 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,35 @@ jobs:
arch: [ amd64, arm64 ]
steps:
- uses: actions/checkout@v4
# todo: remove when crun issue is resolved
- uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
# 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
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Build the image
Expand All @@ -38,8 +65,35 @@ jobs:
platform: [ kvm, metal ]
steps:
- uses: actions/checkout@v4
# todo: remove when crun issue is resolved
- uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
# 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
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Configure Build Variant
Expand Down
62 changes: 58 additions & 4 deletions .github/workflows/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,35 @@ jobs:
arch: [ amd64, arm64 ]
steps:
- uses: actions/checkout@v4
# todo: remove when crun issue is resolved
- uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
# 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
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Build the repo
Expand All @@ -42,8 +69,35 @@ jobs:
platform: [ kvm, metal ]
steps:
- uses: actions/checkout@v4
# todo: remove when crun issue is resolved
- uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
# 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
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Configure Build Variant
Expand Down
31 changes: 29 additions & 2 deletions .github/workflows/sysexts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,35 @@ jobs:
arch: [ x86-64, arm64 ]
steps:
- uses: actions/checkout@v4
# todo: remove when crun issue is resolved
- uses: gardenlinux/gardenlinux/.github/actions/setup/action.yml@main
# 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
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Setup mkosi
Expand Down

0 comments on commit 084edb2

Please sign in to comment.