Skip to content

Commit

Permalink
Fix MacOS CI (#2466)
Browse files Browse the repository at this point in the history
* Add timeout-minutes: 30

* Test for JOBS=2

* Limit to 2 jobs on MacOS CI
  • Loading branch information
thomas-bc authored Jan 4, 2024
1 parent bf3e7eb commit 5d68e1a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .github/workflows/build-test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
jobs:
macOS-Framework:
runs-on: macos-latest
timeout-minutes: 30
steps:
- name: "Checkout F´ Repository"
uses: actions/checkout@v4
Expand All @@ -29,6 +30,9 @@ jobs:
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Framework.bash
env:
# Limit to 2 jobs to avoid resource exhaustion (https://github.com/nasa/fprime/issues/2462)
JOBS: 2
# Archive the outputs
- name: 'Archive Logs'
uses: actions/upload-artifact@v3
Expand All @@ -40,6 +44,7 @@ jobs:

macOS-Ref:
runs-on: macos-latest
timeout-minutes: 30
steps:
- name: "Checkout F´ Repository"
uses: actions/checkout@v4
Expand All @@ -49,6 +54,8 @@ jobs:
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Ref.bash
env:
JOBS: 2
# Archive the outputs
- name: 'Archive Logs'
uses: actions/upload-artifact@v3
Expand All @@ -60,6 +67,7 @@ jobs:

macOS-Integration:
runs-on: macos-latest
timeout-minutes: 30
steps:
- name: "Checkout F´ Repository"
uses: actions/checkout@v4
Expand All @@ -71,6 +79,8 @@ jobs:
run: brew install coreutils
- name: F prime CI step
run: ./ci/tests/30-ints.bash
env:
JOBS: 2
# Archive the outputs
- name: 'Archive Logs'
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion ci/tests/fputil.bash
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export FPUTIL_TARGETS=("generate" "generate --ut" "build" "build --all" "check -
function fputil_action {
export WORKDIR="${1}"
export TARGET="${2}"
let JOBS="${JOBS:-$(( ( RANDOM % 9 ) + 1 ))}"
let JOBS="${JOBS:-$(( ( RANDOM % 100 ) + 1 ))}"
(
PLATFORM=""

Expand Down

0 comments on commit 5d68e1a

Please sign in to comment.