Skip to content

Commit b039812

Browse files
committed
wip
1 parent 3a15b8e commit b039812

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/build-all.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
jobs:
1111
build-tarballs:
1212
strategy:
13+
fail-fast: false
1314
matrix:
1415
include:
1516
- { target: x86_64, os: ubuntu-24.04 }
@@ -29,11 +30,11 @@ jobs:
2930
- name: Checkout Repository
3031
uses: actions/checkout@v4
3132

32-
- name: Install Podman
33-
run: sudo apt-get update && sudo apt-get install -y podman
33+
- name: Set up Docker Buildx
34+
uses: docker/setup-buildx-action@v3
3435

3536
- name: Login to GitHub Container Registry
36-
uses: redhat-actions/podman-login@v1
37+
uses: docker/login-action@v1
3738
with:
3839
registry: ghcr.io
3940
username: ${{ github.repository_owner }}

dist.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@ esac
6464
if [ "$GITHUB_REPOSITORY" = '' ]; then
6565
image=mold-builder-$arch
6666
image_build="podman build --arch $arch -t $image -"
67+
image_run="podman run --userns=host --pids-limit=-1"
6768
else
6869
# If this script is running on GitHub Actions, we want to cache
6970
# the created container image in GitHub's container repostiory.
7071
image=ghcr.io/$GITHUB_REPOSITORY/mold-builder-$arch
71-
image_build="podman build --arch $arch -t $image --output=type=registry --layers --cache-to $image --cache-from $image -"
72+
image_build="docker build --arch $arch -t $image --output=type=registry --layers --cache-to $image --cache-from $image -"
73+
image_run="docker run"
7274
fi
7375

7476
case $arch in
@@ -200,8 +202,8 @@ timestamp="$(git log -1 --format=%ci)"
200202
# Build mold in a container.
201203
mkdir -p dist
202204

203-
podman run --arch $arch -it --rm --userns=host --pids-limit=-1 \
204-
-v "$(pwd):/mold:ro" -v "$(pwd)/dist:/dist" $image bash -c "
205+
$image_run --arch $arch -it --rm -v "$(pwd):/mold:ro" -v "$(pwd)/dist:/dist" \
206+
$image bash -c "
205207
set -e
206208
mkdir /build
207209
cd /build

0 commit comments

Comments
 (0)