Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable-6.0' into feature/app_gen…
Browse files Browse the repository at this point in the history 
…erations
  • Loading branch information
@CamJN
CamJN committed Oct 16, 2024
2 parents b40c7d2 + a1b63b6 commit 506dccd
Show file tree
Hide file tree
Showing 42 changed files with 1,394 additions and 329 deletions.
243 changes: 198 additions & 45 deletions .github/workflows/binaries.yml
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,220 @@
name: Passenger generic binaries tests CI tests
name: Passenger generic binaries CI

env:
ENTERPRISE: 0
FORCE_COLOR: 1
RUST_LOG_STYLE: always

on:
push: {}
pull_request: {}

jobs:
build_linux:
name: "Binary automation Linux-${{ matrix.arch }}"
name: Binaries Linux ${{ matrix.arch }}
strategy:
fail-fast: false
matrix:
include:
- arch: x86_64
runner: ubuntu-24.04
- arch: aarch64
runner: passenger-ubuntu-24.04-arm64-2cpu
- runner: ubuntu-24.04
arch: x86_64
docker_arch: amd64
- runner: passenger-ubuntu-24.04-arm64-4cpu
arch: aarch64
docker_arch: arm64
runs-on: ${{ matrix.runner }}
env:
WORKSPACE: ${{ github.workspace }}
OUTPUT_DIR: ${{ github.workspace }}/output-linux-${{ matrix.arch }}
ARCHITECTURE: ${{ matrix.arch }}
CACHE_DIR: ${{ github.workspace }}/cache/linux-${{ matrix.arch }}/executor-${{ github.run_id }}
RUNTIME_DIR: ${{ github.workspace }}/cache/linux-${{ matrix.arch }}/executor-${{ github.run_id }}/runtime
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: docker/setup-buildx-action@v3
- run: ./dev/ci/tests/binaries/build-linux
- uses: actions/upload-artifact@v4
with:
name: binaries-linux-${{ matrix.arch }}
path: 'output-linux-${{ matrix.arch }}/**/*'
- run: ./dev/ci/tests/binaries/test-linux
- uses: actions/checkout@v4
with:
submodules: true

- run: mkdir cache output
working-directory: packaging/binaries/linux

- name: Fetch cache
run: ./dev/ci/fetch-cache-az-blob-storage
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
BLOB_NAME: "binaries/linux-binaries-cache-${{ hashFiles('packaging/binaries/linux/docker_image/Dockerfile') }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd"
CACHE_PATH: packaging/binaries/linux/cache

- name: Build
run: >
./build
-p "$WORKSPACE"
-c cache
-o output
-A "$DOCKER_ARCH"
-j 2
passenger nginx
env:
WORKSPACE: ${{ github.workspace }}
DOCKER_ARCH: ${{ matrix.docker_arch }}
working-directory: packaging/binaries/linux

- uses: actions/upload-artifact@v4
with:
name: binaries-linux-${{ matrix.arch }}
path: packages/binaries/linux/output/**/*

- name: Update cache
run: ./dev/ci/update-cache-az-blob-storage
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
BLOB_NAME: "binaries/linux-binaries-cache-${{ hashFiles('packaging/binaries/linux/docker_image/Dockerfile') }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd"
CACHE_PATH: packaging/binaries/linux/cache
if: '!cancelled()'

- name: Package
run: ./package -i output -o output -a "$ARCHITECTURE"
env:
ARCHITECTURE: ${{ matrix.arch }}
working-directory: packaging/binaries/linux

- name: Test
run: >
./test
-p "$WORKSPACE"
-i output
-I output
-A "$DOCKER_ARCH"
env:
WORKSPACE: ${{ github.workspace }}
DOCKER_ARCH: ${{ matrix.docker_arch }}
working-directory: packaging/binaries/linux

build_macos:
name: "Binary automation macOS-${{ matrix.arch }}"
name: Binaries macOS ${{ matrix.arch }}
strategy:
fail-fast: false
matrix:
arch:
- x86_64
- aarch64
runs-on: macos-${{ matrix.arch == 'x86_64' && '13' || 'latest' }}
include:
- runner: macos-13
arch: x86_64
sccache_arch_and_os: x86_64-apple-darwin
sccache_azure_key_prefix: sccache/cxx-macos-13-x86_64
- runner: macos-14
arch: arm64
sccache_arch_and_os: aarch64-apple-darwin
sccache_azure_key_prefix: sccache/cxx-macos-14-arm
runs-on: ${{ matrix.runner }}
env:
WORKSPACE: ${{ github.workspace }}
OUTPUT_DIR: ${{ github.workspace }}/output-macos-${{ matrix.arch }}
ARCHITECTURE: ${{ matrix.arch }}
CACHE_DIR: ${{ github.workspace }}/cache/macos-${{ matrix.arch }}/executor-${{ github.run_id }}
RUNTIME_DIR: ${{ github.workspace }}/cache/macos-${{ matrix.arch }}/executor-${{ github.run_id }}/runtime
CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
SCCACHE_AZURE_BLOB_CONTAINER: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
SCCACHE_AZURE_KEY_PREFIX: ${{ matrix.sccache_azure_key_prefix }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- run: \curl -sSL https://get.rvm.io | bash
- run: xargs -I{} "$HOME/.rvm/bin/rvm" install ruby-{} < packaging/binaries/shared/definitions/ruby_versions
- run: ./dev/ci/tests/binaries/prepare-macos
- run: ./dev/ci/tests/binaries/build-macos
- uses: actions/upload-artifact@v4
with:
name: binaries-macos-${{ matrix.arch }}
path: 'output-macos-${{ matrix.arch }}/**/*'
- run: ./dev/ci/tests/binaries/test-macos
- uses: actions/checkout@v4
with:
submodules: true

- name: Install dependencies
run: brew install zlib automake libtool coreutils

- run: mkdir work runtime-output output
working-directory: packaging/binaries/macos

- name: Determine runtime version
id: determine_runtime_version
run: |
RUNTIME_VERSION=$(cat ../shared/definitions/macos_runtime_version)
echo "version=$RUNTIME_VERSION" >> "$GITHUB_OUTPUT"
working-directory: packaging/binaries/macos


- name: Fetch RVM cache
run: CACHE_PATH="$HOME/.rvm" ./dev/ci/fetch-cache-az-blob-storage
id: fetch_rvm_cache
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
BLOB_NAME: "binaries/rvm-${{ hashFiles('packaging/binaries/shared/definitions/ruby_versions') }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd"

- name: Install RVM
run: set -o pipefail && curl -fsSL https://get.rvm.io/stable | bash

- name: Install Rubies
run: xargs -I{} "$HOME/.rvm/bin/rvm" install ruby-{} < packaging/binaries/shared/definitions/ruby_versions
if: steps.fetch_rvm_cache.outputs.cache-hit != 'true'

- name: Cleanup RVM
run: ~/.rvm/bin/rvm cleanup all
if: steps.fetch_rvm_cache.outputs.cache-hit != 'true'

- name: Update RVM cache
run: CACHE_PATH="$HOME/.rvm" ./dev/ci/update-cache-az-blob-storage
if: steps.fetch_rvm_cache.outputs.cache-hit != 'true'
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
BLOB_NAME: "binaries/rvm-${{ hashFiles('packaging/binaries/shared/definitions/ruby_versions') }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd"


- name: Setup sccache
run: ./dev/ci/setup-sccache
timeout-minutes: 1
env:
ARCH_AND_OS: ${{ matrix.sccache_arch_and_os }}
SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}


- name: Fetch runtime cache
run: ./dev/ci/fetch-cache-az-blob-storage
id: fetch_runtime_cache
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
BLOB_NAME: binaries/macos-runtime-${{ steps.determine_runtime_version.outputs.version }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd
CACHE_PATH: packaging/binaries/macos/runtime-output

- name: Compile runtime
run: ./setup-runtime -w work -o runtime-output -j 4
if: steps.fetch_runtime_cache.outputs.cache-hit != 'true'
working-directory: packaging/binaries/macos

- name: Update runtime cache
run: ./dev/ci/update-cache-az-blob-storage
if: steps.fetch_runtime_cache.outputs.cache-hit != 'true'
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
BLOB_NAME: binaries/macos-runtime-${{ steps.determine_runtime_version.outputs.version }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd
CACHE_PATH: packaging/binaries/macos/runtime-output


- name: Build binaries
run: ./build -p "$WORKSPACE" -r runtime-output -w work -o output -j 4 passenger nginx
env:
WORKSPACE: ${{ github.workspace }}
working-directory: packaging/binaries/macos

- uses: actions/upload-artifact@v4
with:
name: binaries-macos-${{ matrix.arch }}
path: packaging/binaries/macos/output/**/*


- name: Package binaries
run: ./package -i output -o output
working-directory: packaging/binaries/macos

- name: Cache test suite gem bundle
uses: actions/cache@v4
with:
path: packaging/binaries/macos/runtime-output/gems
key: test-gems-${{ hashFiles('packaging/binaries/shared/Gemfile.lock', 'packaging/binaries/shared/definitions/ruby_versions') }}-${{ matrix.runner }}-${{ matrix.arch }}

- name: Test
run: ./test -p "$WORKSPACE" -r runtime-output -i output -I output
env:
WORKSPACE: ${{ github.workspace }}
working-directory: packaging/binaries/macos


- name: Teardown sccache
run: ./dev/ci/teardown-sccache
if: '!cancelled()'

- name: Archive configure logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: generic-binaries-logs-macos
path: packaging/binaries/macos/work/*/config.log
if-no-files-found: ignore
89 changes: 64 additions & 25 deletions .github/workflows/debian.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
name: Passenger Debian packaging tests

env:
ENTERPRISE: 0
FORCE_COLOR: 1
RUST_LOG_STYLE: always

on:
push:
branches:
- 'stable-*'
- 'feature/*'
pull_request:
branches:
- 'stable-*'
- 'feature/*'
push: {}
pull_request: {}

jobs:
define-matrix:
Expand All @@ -27,29 +22,73 @@ jobs:
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"
name: ${{ matrix.distro }} ${{ matrix.arch.name }}
needs: define-matrix
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }}
arch:
- amd64
- arm64
- name: amd64
runner: ubuntu-24.04
- name: arm64
runner: passenger-ubuntu-24.04-arm64-4cpu
runs-on: ${{ matrix.arch.runner }}
env:
WORKSPACE: ${{ github.workspace }}
ARCHITECTURE: ${{ matrix.arch }}
CACHE_DIR: ${{ github.workspace }}/cache/debian-test/${{ matrix.distro }}-${{ matrix.arch }}
ARCHITECTURE: ${{ matrix.arch.name }}
CACHE_DIR: ${{ github.workspace }}/cache/debian-test/${{ matrix.distro }}-${{ matrix.arch.name }}
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 }}/*'
- uses: actions/checkout@v4
with:
submodules: true

- run: mkdir work cache output

- name: Fetch cache
run: ./dev/ci/fetch-cache-az-blob-storage
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
BLOB_NAME: "binaries/debian-cache-${{ matrix.distro }}-${{ matrix.arch.name }}.tar.zstd"
CACHE_PATH: packaging/debian/cache
SUDO: true

- name: Build
run: ./build -w work -c cache -o output -p "$WORKSPACE" -d "$DISTRIBUTION" -a "$ARCHITECTURE" -R pkg:all
env:
WORKSPACE: ${{ github.workspace }}
DISTRIBUTION: ${{ matrix.distro }}
ARCHITECTURE: ${{ matrix.arch.name }}
working-directory: packaging/debian

- name: Test
run: >
./test
-p "$WORKSPACE"
-d "output/$DISTRIBUTION"
-c cache
-x "$DISTRIBUTION"
-a "$ARCHITECTURE"
-j
env:
WORKSPACE: ${{ github.workspace }}
DISTRIBUTION: ${{ matrix.distro }}
ARCHITECTURE: ${{ matrix.arch.name }}
working-directory: packaging/debian

- name: Update cache
run: ./dev/ci/update-cache-az-blob-storage
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
BLOB_NAME: "binaries/debian-cache-${{ matrix.distro }}-${{ matrix.arch.name }}.tar.zstd"
CACHE_PATH: packaging/debian/cache
SUDO: true
if: '!cancelled()'

- uses: actions/upload-artifact@v4
with:
name: debian-${{ matrix.distro }}-${{ matrix.arch.name }}
path: packaging/debian/output/${{ matrix.distro }}/*
Loading

0 comments on commit 506dccd

Please sign in to comment.