Skip to content

Commit 6977454

Browse files
authored
Fix Ubuntu deb package build (#17)
* deb: fix ubuntu deb builder * MUST_REVERT: kick ci * Revert "MUST_REVERT: kick ci" This reverts commit 0af0021. * MUST_REVERT: temporary pkgversion * Reapply "MUST_REVERT: kick ci" This reverts commit 3526007. * Revert "MUST_REVERT: temporary pkgversion" This reverts commit 222af18. * build: fix default and debname * build: fix image name * MUST_REVERT: version * build: fix * build: fix * Revert "Reapply "MUST_REVERT: kick ci"" This reverts commit 9ca724c. * Revert "MUST_REVERT: version" This reverts commit 0d0f80c. * build: fix * Reapply "Reapply "MUST_REVERT: kick ci"" This reverts commit 04309a9. * MUST_REVERT: version again * Revert "Reapply "Reapply "MUST_REVERT: kick ci""" This reverts commit 4e4c990. * Revert "MUST_REVERT: version again" This reverts commit df976a4.
1 parent e22647f commit 6977454

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
timeout-minutes: 60
1010
strategy:
1111
matrix:
12-
arch: ["arm64v8", "amd64"]
12+
platform: ["linux/arm64/v8", "linux/amd64"]
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4
@@ -24,19 +24,21 @@ jobs:
2424
- name: Build Container
2525
uses: docker/build-push-action@v6
2626
with:
27-
build-args: ARCH=${{ matrix.arch }}
27+
build-args: PLATFORM=${{ matrix.platform }}
2828
cache-from: type=gha
2929
cache-to: type=gha,mode=max
3030
context: .
3131
file: ./build/ubuntu2204/Dockerfile
3232
load: true
33-
tags: "pskel-build-ubuntu2204-${{ matrix.arch }}"
33+
tags: "pskel-build-ubuntu2204-${{ matrix.platform }}"
3434
- name: Build Extension with Container
35+
id: build_container
3536
run: |
37+
echo "arch=$(echo "${{ matrix.platform }}" | sed "s/^linux\///g" | sed "s/\//_/g")" >> $GITHUB_OUTPUT
3638
mkdir "artifacts"
37-
docker run --env VERSION="${{ github.ref_name }}" --rm -v"$(pwd)/artifacts:/tmp/artifacts" -i "pskel-build-ubuntu2204-${{ matrix.arch }}"
39+
docker run --env VERSION="${{ github.ref_name }}" --rm -v"$(pwd)/artifacts:/tmp/artifacts" -i "pskel-build-ubuntu2204-${{ matrix.platform }}"
3840
- name: Upload deb Packages
3941
uses: actions/upload-artifact@v4
4042
with:
41-
name: ubuntu_2204_debs-${{ matrix.arch }}
43+
name: ubuntu_2204_debs_${{ steps.build_container.outputs.arch }}
4244
path: artifacts/

build/ubuntu2204/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG ARCH=amd64
1+
ARG PLATFORM=linux/amd64
22

3-
FROM ${ARCH}/ubuntu:22.04
3+
FROM --platform=${PLATFORM} ubuntu:22.04
44

55
RUN apt-get update && \
66
DEBIAN_FRONTEND="noninteractive" apt-get install -y "php" "php-dev" "checkinstall"

0 commit comments

Comments
 (0)