Skip to content

Commit

Permalink
Merge #1417
Browse files Browse the repository at this point in the history
1417: Make GHA run on julia 1.9 r=charleskawczynski a=charleskawczynski

It might be nice to incrementally merge #1235. The main thing holding it back is issues with the shared depot path. One thing we can do is start running ClimaCore on 1.9 in GHA, and fix the inference issues that occur from upgrading, without having to deal with the shared depot path issue.

I don't love the idea of being straddled between versions, but the only breaking differences seem to be inference, which I suspect we can fix for both versions without too much headache.

Co-authored-by: Charles Kawczynski <[email protected]>
  • Loading branch information
bors[bot] and charleskawczynski authored Aug 9, 2023
2 parents 8be60b8 + e0ead14 commit 55b7014
Show file tree
Hide file tree
Showing 15 changed files with 279 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCoreMakie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.9'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCorePlots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.9'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCoreSpectra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.9'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCoreTempestRemap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.9'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ClimaCoreVTK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.9'
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CodeCov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Julia
uses: julia-actions/setup-julia@latest
with:
version: 1.8
version: 1.9

- name: Test with coverage
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/JuliaFormatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: julia-actions/setup-julia@latest
if: steps.filter.outputs.julia_file_change == 'true'
with:
version: 1.8
version: 1.9

- name: Apply JuliaFormatter
if: steps.filter.outputs.julia_file_change == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Linux-UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
julia-version: ['1.8']
julia-version: ['1.9']

env:
CLIMATEMACHINE_SETTINGS_FIX_RNG_SEED: "true"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OS-UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: julia-actions/setup-julia@v1
if: steps.filter.outputs.run_test == 'true'
with:
version: 1.8
version: 1.9

- name: Cache artifacts
uses: julia-actions/cache@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: 1.8
version: 1.9
- name: Install dependencies
run: julia --project=docs -e 'using Pkg; Pkg.instantiate(;verbose=true)'
- name: Build and deploy
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
status = [
"test-os (ubuntu-20.04)",
"test-os (windows-latest)",
# "test-os (macos-latest)",
"test-os (macos-latest)",
"lib-climacore-vtk",
"lib-climacore-makie",
"lib-climacore-plots",
Expand Down
Loading

0 comments on commit 55b7014

Please sign in to comment.