From 5c8377dd741346851d3fd4403051f1686fb23efc Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Sat, 7 Sep 2024 00:48:20 -0600 Subject: [PATCH 1/5] =?UTF-8?q?disable=20workflows=20I=E2=80=99m=20not=20w?= =?UTF-8?q?orking=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/binaries.yml | 8 ++++++-- .github/workflows/main.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index d3c469f5ae..7ccbf2fdb0 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -5,9 +5,13 @@ env: on: push: - branches: [ 'stable-*', 'feature/*' ] + branches: + - 'stable-*' + # - 'feature/*' pull_request: - branches: [ 'stable-*', 'feature/*' ] + branches: + - 'stable-*' + # - 'feature/*' jobs: build_linux: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a572b83e06..1b191cc673 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,9 +6,13 @@ env: on: push: - branches: [ 'stable-*', 'feature/*' ] + branches: + - 'stable-*' + # - 'feature/*' pull_request: - branches: [ 'stable-*', 'feature/*' ] + branches: + - 'stable-*' + # - 'feature/*' jobs: cxx: From d2eacfc1107ef4fae3377da5f338be8937c677bb Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Sat, 7 Sep 2024 00:48:34 -0600 Subject: [PATCH 2/5] initial debian automation for GHA --- .github/workflows/debian.yml | 55 ++++++++++++++++++++++++++++++++++++ dev/ci/tests/debian/run | 1 + packaging/debian | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/debian.yml diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml new file mode 100644 index 0000000000..8a9a3aa633 --- /dev/null +++ b/.github/workflows/debian.yml @@ -0,0 +1,55 @@ +name: Passenger Debian packaging tests + +env: + ENTERPRISE: 0 + +on: + push: + branches: + - 'stable-*' + # - 'feature/*' + pull_request: + branches: + - 'stable-*' + # - 'feature/*' + +jobs: + define-matrix: + runs-on: ubuntu-latest + outputs: + distros: ${{ steps.distros.outputs.distros }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Define Distros + id: distros + run: echo "distros=[$(awk -F= '/DEFAULT_DISTROS/{print $2}' packaging/debian/internal/lib/distro_info.sh | sed -e 's/ /", "/g')]" >> "$GITHUB_OUTPUT" + + test: + name: "Test ${{ matrix.distro }} ${{ matrix.arch }} packages" + needs: define-matrix + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }} + arch: + - amd64 + #- arm64 + env: + WORKSPACE: ${{ github.workspace }} + ARCHITECTURE: ${{ matrix.arch }} + CACHE_DIR: ${{ github.workspace }}/cache/debian-test/${{ matrix.distro }}-${{ matrix.arch }} + DISTRIBUTION: ${{ matrix.distro }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - run: ./dev/ci/tests/debian/run + - uses: actions/upload-artifact@v4 + with: + name: debian-${{ matrix.distro }}-${{ matrix.arch }} + path: 'output/${{ matrix.distro }}/*' diff --git a/dev/ci/tests/debian/run b/dev/ci/tests/debian/run index ba213e4971..8d6b1e6e5b 100755 --- a/dev/ci/tests/debian/run +++ b/dev/ci/tests/debian/run @@ -56,5 +56,6 @@ run ./test \ -d "$WORKSPACE/output/$DISTRIBUTION" \ -c "$CACHE_DIR" \ -x "$DISTRIBUTION" \ + -a "$ARCHITECTURE" \ -j \ $EXTRA_TEST_PARAMS diff --git a/packaging/debian b/packaging/debian index c00dea877d..d76c641327 160000 --- a/packaging/debian +++ b/packaging/debian @@ -1 +1 @@ -Subproject commit c00dea877d3bb6c7fb58338aa0a1d03c3efc2e62 +Subproject commit d76c641327181d94c40b8bb409d36863b8709a3e From 76daa08761320b51ce8063dce83c52d6708654bc Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Sat, 7 Sep 2024 00:48:43 -0600 Subject: [PATCH 3/5] initial rpm automation for GHA --- .github/workflows/rpm.yml | 55 +++++++++++++++++++++++++++++++++++++++ dev/ci/tests/rpm/run | 1 + packaging/rpm | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/rpm.yml diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml new file mode 100644 index 0000000000..d83b8516f3 --- /dev/null +++ b/.github/workflows/rpm.yml @@ -0,0 +1,55 @@ +name: Passenger RPM packaging tests + +env: + ENTERPRISE: 0 + +on: + push: + branches: + - 'stable-*' + - 'feature/*' + pull_request: + branches: + - 'stable-*' + - 'feature/*' + +jobs: + define-matrix: + runs-on: ubuntu-latest + outputs: + distros: ${{ steps.distros.outputs.distros }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Define Distros + id: distros + run: echo "distros=[$(awk -F= '/DEFAULT_DISTROS/{print $2}' packaging/rpm/internal/lib/distro_info.sh | sed -e 's/ /", "/g')]" >> "$GITHUB_OUTPUT" + + test: + name: "Test ${{ matrix.distro }} ${{ matrix.arch }} packages" + needs: define-matrix + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }} + arch: + - x86_64 + #- aarch64 + env: + WORKSPACE: ${{ github.workspace }} + ARCHITECTURE: ${{ matrix.arch }} + CACHE_DIR: ${{ github.workspace }}/cache/rpm-test/${{ matrix.distro }}-${{ matrix.arch }} + DISTRIBUTION: ${{ matrix.distro }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - run: ./dev/ci/tests/rpm/run + - uses: actions/upload-artifact@v4 + with: + name: rpm-${{ matrix.distro }}-${{ matrix.arch }} + path: 'output/${{ matrix.distro }}/*' diff --git a/dev/ci/tests/rpm/run b/dev/ci/tests/rpm/run index 1d96dd2cb5..b881cdc96a 100755 --- a/dev/ci/tests/rpm/run +++ b/dev/ci/tests/rpm/run @@ -59,5 +59,6 @@ run ./test \ -d "$WORKSPACE/output/$DISTRIBUTION" \ -c "$CACHE_DIR" \ -x "$TEST_DISTRO_NAME" \ + -a "$ARCHITECTURE" \ -j \ $EXTRA_TEST_PARAMS diff --git a/packaging/rpm b/packaging/rpm index 7028e681a7..0f3f49bd32 160000 --- a/packaging/rpm +++ b/packaging/rpm @@ -1 +1 @@ -Subproject commit 7028e681a7eeb357430f61e77895fe74169d9f9d +Subproject commit 0f3f49bd32134f52295e615c2294a45bf4bb817f From 46a391161fc85c1923395e342758b45d4747731d Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Sat, 7 Sep 2024 00:51:10 -0600 Subject: [PATCH 4/5] enable other suites --- .github/workflows/binaries.yml | 4 ++-- .github/workflows/debian.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index 7ccbf2fdb0..8af3b2d84e 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -7,11 +7,11 @@ on: push: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' pull_request: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' jobs: build_linux: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 8a9a3aa633..52f1226b52 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -7,11 +7,11 @@ on: push: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' pull_request: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' jobs: define-matrix: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b191cc673..8813b966a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,11 +8,11 @@ on: push: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' pull_request: branches: - 'stable-*' - # - 'feature/*' + - 'feature/*' jobs: cxx: From b64f698ea6eb6d7c0b6a3c8c3f15cae64826a050 Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Sat, 7 Sep 2024 00:52:12 -0600 Subject: [PATCH 5/5] enable arm --- .github/workflows/debian.yml | 2 +- .github/workflows/rpm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 52f1226b52..2c3f442308 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -36,7 +36,7 @@ jobs: distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }} arch: - amd64 - #- arm64 + - arm64 env: WORKSPACE: ${{ github.workspace }} ARCHITECTURE: ${{ matrix.arch }} diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml index d83b8516f3..86410bc78e 100644 --- a/.github/workflows/rpm.yml +++ b/.github/workflows/rpm.yml @@ -36,7 +36,7 @@ jobs: distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }} arch: - x86_64 - #- aarch64 + - aarch64 env: WORKSPACE: ${{ github.workspace }} ARCHITECTURE: ${{ matrix.arch }}