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.

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

Use macos-14 in github actions #7546

Closed
wants to merge 2 commits into from
Closed

Use macos-14 in github actions #7546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20fbd2
Use macos-14 in github actions
larsevj Apr 3, 2024
6f1081c
Increase timeout for non test steps
larsevj Apr 4, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ jobs:
fail-fast: false
matrix:
python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
os: [ 'macos-13', 'macos-latest-xlarge' ]
os: [ 'macos-13', 'macos-14' ]
exclude:
- os: 'macos-latest-xlarge'
- os: 'macos-14'
python-version: '3.8'
- os: 'macos-latest-xlarge'
- os: 'macos-14'
python-version: '3.9'

uses: ./.github/workflows/build-wheels-macos.yml
Expand All @@ -140,7 +140,7 @@ jobs:
fail-fast: false
matrix:
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
os: [ 'macos-14' ]
uses: ./.github/workflows/build-wheels-macos.yml
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -180,9 +180,9 @@ jobs:
matrix:
test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
python-version: [ '3.8', '3.12' ]
os: [ 'macos-13', 'macos-latest-xlarge' ]
os: [ 'macos-13', 'macos-14' ]
exclude:
- os: 'macos-latest-xlarge'
- os: 'macos-14'
python-version: '3.8'
uses: ./.github/workflows/test_ert.yml
with:
Expand All @@ -198,7 +198,7 @@ jobs:
matrix:
test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ]
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
os: [ 'macos-14' ]
uses: ./.github/workflows/test_ert.yml
with:
os: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_ert.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-python@v5
id: setup_python
timeout-minutes: 5
timeout-minutes: 10
with:
python-version: ${{ inputs.python-version }}
cache: "pip"
Expand All @@ -35,12 +35,12 @@ jobs:

- name: Get wheels
uses: actions/download-artifact@v4
timeout-minutes: 5
timeout-minutes: 10
with:
name: ${{ inputs.os }} Python ${{ inputs.python-version }} wheel

- name: Install wheel
timeout-minutes: 5
timeout-minutes: 10
run: |
find . -name "*.whl" -exec pip install "{}[dev]" \;

Expand Down