Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Build layers independently to speed up GitHub Actions tests #1787

Closed
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into github-parallel-layers-testing
  • Loading branch information
yadij authored May 3, 2024
commit e308decc0c3864f9fc62740656b04d9d429566b0
27 changes: 25 additions & 2 deletions .github/workflows/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ ubuntu-22.04 ]
os: [ ubuntu-22.04, macos-14 ]
layer:
- layer-00-default
- layer-01-minimal
Expand Down Expand Up @@ -122,7 +122,30 @@ jobs:
gnu-getopt gnu-sed grep libtool \
make openldap openssl cyrus-sasl

- run: ./test-builds.sh ${{ matrix.layer }}
- name: Checkout sources
uses: actions/checkout@v4

- name: Run build on Linux
if: runner.os == 'Linux'
run: ./test-builds.sh ${{ matrix.layer }}

- name: Run build on MacOS
if: runner.os == 'macOS'
run: |
eval `brew shellenv`
PKG_CONFIG_PATH="$HOMEBREW_PREFIX/lib/pkgconfig"
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_PREFIX/opt/openldap/lib/pkgconfig"
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_PREFIX/opt/cyrus-sasl/lib/pkgconfig"
export PKG_CONFIG_PATH
export GETOPT="$HOMEBREW_PREFIX/opt/gnu-getopt/bin/getopt"
export MAKE="$HOMEBREW_PREFIX/bin/gmake"
# ensure we use Homebrew headers and libraries
# this is needed because pkg-config --libs openssl points to the wrong directory
# in version openssl@3: stable 3.3.0
export CPPFLAGS="-I$HOMEBREW_PREFIX/include${CPPFLAGS:+ $CPPFLAGS}"
export LDFLAGS="-L$HOMEBREW_PREFIX/lib${LDFLAGS:+ $LDFLAGS}"
export CFLAGS="-Wno-compound-token-split-by-macro${CFLAGS:+ $CFLAGS}" # needed fir ltdl with Xcode
./test-builds.sh ${{ matrix.layer }}

- name: Publish build logs
if: success() || failure()
kinkie marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.