Skip to content

Commit

Permalink
Merge branch 'main' into glw-ss/ice-ocean-model
Browse files Browse the repository at this point in the history
  • Loading branch information
glwagner committed Oct 12, 2023
2 parents d80a9f9 + 8e6fedd commit f87c6f0
Show file tree
Hide file tree
Showing 13 changed files with 705 additions and 349 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
agents:
queue: central
slurm_mem: 8G
modules: julia/1.8.5 cuda/11.8 ucx/1.14.1_cuda-11.8 openmpi/4.1.5_cuda-11.8 hdf5/1.12.2-ompi415 nsight-systems/2022.2.1
modules: julia/1.9.2 cuda/11.8 ucx/1.14.1_cuda-11.8 openmpi/4.1.5_cuda-11.8 hdf5/1.12.2-ompi415 nsight-systems/2022.2.1

env:
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ jobs:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@latest
with:
version: 1.8
version: 1.9
show-versioninfo: true
- name: Install dependencies
run: |
julia --color=yes --project -e 'using Pkg; Pkg.instantiate()'
julia --color=yes --project -e 'using Pkg; Pkg.precompile()'
julia --color=yes --project=docs/ -e 'using Pkg; Pkg.instantiate()'
julia --color=yes --project=docs/ -e 'using Pkg; Pkg.precompile()'
- name: Build and deploy
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.8'
# We don't want to test on Julia versions more recent than 1.6 until we
# figure out a robust solution for serializing / deserializing Oceananigans Grids.
# - '1' # automatically expands to the latest stable 1.x release of Julia
# - nightly
- '1.9'
os:
- ubuntu-latest
arch:
Expand All @@ -26,13 +22,13 @@ jobs:
# test macOS and Windows with latest Julia only
- os: macOS-latest
arch: x64
version: 1.8
version: 1.9
- os: windows-latest
arch: x64
version: 1.8
version: 1.9
- os: windows-latest
arch: x86
version: 1.8
version: 1.9
steps:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ docs/site/
# environment.
# Manifest.toml

*.nc
*.jld2
*.mp4
*.DS_Store
Expand Down
Loading

0 comments on commit f87c6f0

Please sign in to comment.