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

Run tests for macos-14 on arm64 #1027

Merged
merged 3 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
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
37 changes: 37 additions & 0 deletions .github/workflows/macos-legacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# GitHub Actions workflow to run tests on macOS.
name: "macOS-legacy"

on:
push: {}
pull_request: {}
schedule:
- cron: "0 0 * * 0" # At 00:00 weekly on Sunday.

concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true

jobs:
test:
name: "${{ matrix.os }}/${{ matrix.arch }}"
runs-on: "${{ matrix.os }}"
if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }}
permissions:
contents: read
strategy:
fail-fast: false
matrix:
os: ["macos-13", "macos-12"]
arch: ["arm64", "x86_64"]
steps:
- name: "Install required packages"
run: brew install automake

- name: "Checkout repository"
uses: actions/checkout@v4

- name: "Run tests"
run: ./scripts/test
env:
ARCH: "${{ matrix.arch }}"
OS: "${{ matrix.os }}"
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-14", "macos-13", "macos-12"]
os: ["macos-14"]
arch: ["arm64", "x86_64"]
steps:
- name: "Install required packages"
Expand All @@ -34,3 +34,4 @@ jobs:
run: ./scripts/test
env:
ARCH: "${{ matrix.arch }}"
OS: "${{ matrix.os }}"
8 changes: 6 additions & 2 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ if [ `uname` = "Darwin" ]; then
cd build-static
cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
make -j 4
if [ "$ARCH" = "x86_64" ]; then
if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
echo "##### skip tests"
else
make test
fi
)
Expand All @@ -44,7 +46,9 @@ if [ `uname` = "Darwin" ]; then
cd build-shared
cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
make -j 4
if [ "$ARCH" = "x86_64" ]; then
if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
echo "##### skip tests"
else
make test
fi
)
Expand Down