From 808a43ce830a2fd34498778df9aedaf5501b273e Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 19 Dec 2022 21:53:48 +0000 Subject: [PATCH 1/2] chore(ci): simplify the branch protection rules --- .github/settings.yml | 3 +-- .github/workflows/release.yml | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 4c09f80..22871ec 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -64,8 +64,7 @@ branches: required_pull_request_reviews: required_status_checks: strict: true - contexts: [pre-commit, Create Release, 'Create Release Artifacts (aarch64, linux-gnu)', 'Create Release Artifacts (aarch64, linux-musl)', 'Create - Release Artifacts (x86_64, linux-gnu)', 'Create Release Artifacts (x86_64, linux-musl)'] + contexts: [pre-commit, Create Release, Done] enforce_admins: required_linear_history: true restrictions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 531dd02..40558cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -125,3 +125,11 @@ jobs: ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-aarch64-${{ matrix.ostype }} \ ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-x86_64-${{ matrix.ostype }} docker manifest push ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-${{ matrix.ostype }} + + done: + needs: [artifacts] + name: Done + if: needs.artifacts.result == 'success' + runs-on: ubuntu-latest + steps: + - run: echo 'done' From 58781ac289d13bb71f67575080cb2b33cd0dface Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 19 Dec 2022 21:55:07 +0000 Subject: [PATCH 2/2] feat(ppc64le): add an architecture --- .github/workflows/release.yml | 5 ++++- Dockerfile | 18 ++++++++++-------- build.sh | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40558cb..c4e1330 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,8 +36,11 @@ jobs: name: Create Release Artifacts strategy: matrix: - architecture: [aarch64, x86_64] + architecture: [aarch64, x86_64, ppc64le] ostype: [linux-gnu, linux-musl] + exclude: + - architecture: ppc64le + ostype: linux-musl runs-on: ubuntu-latest steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index c8ab8e2..07b34da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,19 @@ ARG DOCKER_IMAGE_NAME # ATC-router image to copy in the installed atc-router # List out all image permutations to trick dependabot -FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-x86_64-unknown-linux-musl as atc-router-x86_64-linux-musl -FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-x86_64-unknown-linux-gnu as atc-router-x86_64-linux-gnu -FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-aarch64-unknown-linux-musl as atc-router-aarch64-linux-musl -FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-aarch64-unknown-linux-gnu as atc-router-aarch64-linux-gnu +FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-x86_64-unknown-linux-musl as atc-router-x86_64-linux-musl +FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-x86_64-unknown-linux-gnu as atc-router-x86_64-linux-gnu +FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-aarch64-unknown-linux-musl as atc-router-aarch64-linux-musl +FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-aarch64-unknown-linux-gnu as atc-router-aarch64-linux-gnu +FROM --platform=linux/ppc64le ghcr.io/hutchic-org/atc-router-compiled:1.2.0-powerpc64le-unknown-linux-gnu as atc-router-ppc64le-linux-gnu # Kong openssl image as our base # List out all image permutations to trick dependabot -FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.0.3-x86_64-linux-musl as x86_64-linux-musl -FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.0.3-x86_64-linux-gnu as x86_64-linux-gnu -FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.0.3-aarch64-linux-musl as aarch64-linux-musl -FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.0.3-aarch64-linux-gnu as aarch64-linux-gnu +FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.1.0-x86_64-linux-musl as x86_64-linux-musl +FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.1.0-x86_64-linux-gnu as x86_64-linux-gnu +FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.1.0-aarch64-linux-musl as aarch64-linux-musl +FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.1.0-aarch64-linux-gnu as aarch64-linux-gnu +FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-openssl:1.1.0-ppc64le-linux-gnu as ppc64le-linux-gnu FROM atc-router-$ARCHITECTURE-$OSTYPE as atc-router diff --git a/build.sh b/build.sh index a593c7b..7fb55cd 100755 --- a/build.sh +++ b/build.sh @@ -48,7 +48,7 @@ function main() { "--with-http_stub_status_module" "--with-http_v2_module" "--without-http_encrypted_session_module" - "--with-luajit-xcflags='-DLUAJIT_VERSION=\\\"${lj_version_tag}\\\"'" + "--with-luajit-xcflags='-std=gnu99 -DLUAJIT_VERSION=\\\"${lj_version_tag}\\\"'" "-j2" )