Skip to content

Modify pr build and test workflow to include macOS #42031

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.

Sign up for GitHub

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

Open
SilkeSchomann wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −4
Open

Modify pr build and test workflow to include macOS #42031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions .github/workflows/pr_build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,14 @@ jobs:

strategy:
matrix:
# Skip Windows when the PR targets ornl-next (ORNL-specific branch, Linux only)
include: ${{ fromJson(github.base_ref == 'ornl-next' && '[{"os":"Linux","cmake_preset":"linux-64-ci"}]' || '[{"os":"Linux","cmake_preset":"linux-64-ci"},{"os":"Windows","cmake_preset":"win-64-ci"}]') }}
# Skip Windows and macOS when the PR targets ornl-next (ORNL-specific branch, Linux only)
include: ${{ fromJson(github.base_ref == 'ornl-next' && '[{"os":"Linux","cmake_preset":"linux-64-ci","arch":"X64"}]' || '[{"os":"Linux","cmake_preset":"linux-64-ci","arch":"X64"},{"os":"Windows","cmake_preset":"win-64-ci","arch":"X64"},{"os":"macOS","cmake_preset":"osx-arm64-ci","arch":"ARM64"}]') }}

runs-on:
- ${{ (inputs.RUNNER_LABEL == '' && 'self-hosted') || inputs.RUNNER_LABEL }}
- self-hosted
- ${{ matrix.os }}
- X64
- ${{ matrix.arch }}
#
# If the user who clicked "Run Workflow" button left the RUNNER_LABEL field blank,
# the default evaluated output is the string 'self-hosted'.
Expand Down Expand Up @@ -216,7 +216,11 @@ jobs:
run: |
cd ${GITHUB_WORKSPACE}
# Not physical but logical cores, includes hyper threaded - different for darwin
BUILD_THREADS="$(grep -c ^processor /proc/cpuinfo)"
if [ "$(uname)" = "Darwin" ]; then
BUILD_THREADS="$(sysctl -n hw.ncpu)"
else
BUILD_THREADS="$(grep -c ^processor /proc/cpuinfo)"
fi
# bool flags for this are
# SYSTEM_TESTS UNIT_TESTS DOCS DOC_TESTS
pixi run --frozen bash -ex ${GITHUB_WORKSPACE}/buildconfig/Jenkins/Conda/run-tests ${GITHUB_WORKSPACE} false true $ENABLE_DOCS $ENABLE_DOC_TESTS ${BUILD_THREADS}
Expand All @@ -237,6 +241,14 @@ jobs:
if-no-files-found: ignore
path: ${{ github.workspace }}/build/Testing/*unittest.xml

- name: Archive unit test output (macOS)
uses: actions/upload-artifact@v7
if: ${{ matrix.os == 'macOS' && failure() && steps.testunit.conclusion == 'failure' }}
with:
name: junit-unit-macOS
if-no-files-found: ignore
path: ${{ github.workspace }}/build/Testing/*unittest.xml

- name: Run system tests
if: ${{ matrix.os == 'Linux' && needs.check-filters.outputs.code_changes == 'true' }}
id: testsystem
Expand Down
Loading