Skip to content

Commit

Permalink
Fix Ubuntu deb package build (#17)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
zeriyoshi authored Nov 27, 2024
1 parent e22647f commit 6977454
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
arch: ["arm64v8", "amd64"]
platform: ["linux/arm64/v8", "linux/amd64"]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -24,19 +24,21 @@ jobs:
- name: Build Container
uses: docker/build-push-action@v6
with:
build-args: ARCH=${{ matrix.arch }}
build-args: PLATFORM=${{ matrix.platform }}
cache-from: type=gha
cache-to: type=gha,mode=max
context: .
file: ./build/ubuntu2204/Dockerfile
load: true
tags: "pskel-build-ubuntu2204-${{ matrix.arch }}"
tags: "pskel-build-ubuntu2204-${{ matrix.platform }}"
- name: Build Extension with Container
id: build_container
run: |
echo "arch=$(echo "${{ matrix.platform }}" | sed "s/^linux\///g" | sed "s/\//_/g")" >> $GITHUB_OUTPUT
mkdir "artifacts"
docker run --env VERSION="${{ github.ref_name }}" --rm -v"$(pwd)/artifacts:/tmp/artifacts" -i "pskel-build-ubuntu2204-${{ matrix.arch }}"
docker run --env VERSION="${{ github.ref_name }}" --rm -v"$(pwd)/artifacts:/tmp/artifacts" -i "pskel-build-ubuntu2204-${{ matrix.platform }}"
- name: Upload deb Packages
uses: actions/upload-artifact@v4
with:
name: ubuntu_2204_debs-${{ matrix.arch }}
name: ubuntu_2204_debs_${{ steps.build_container.outputs.arch }}
path: artifacts/
4 changes: 2 additions & 2 deletions build/ubuntu2204/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ARCH=amd64
ARG PLATFORM=linux/amd64

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

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

0 comments on commit 6977454

Please sign in to comment.