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.

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

Update compats and github workflows #1852

Merged
merged 5 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions .github/workflows/ClimaCoreMakie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ name: ClimaCoreMakie CI
on:
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lib-climacore-makie:
runs-on: ubuntu-20.04
timeout-minutes: 45
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v2
- run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
- name: Install Julia dependencies
run: >
Expand All @@ -34,7 +34,7 @@ jobs:
DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCoreMakie")'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: climacore-makie-output
path: |
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ClimaCorePlots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ name: ClimaCorePlots CI
on:
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lib-climacore-plots:
runs-on: ubuntu-20.04
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v2
- name: Install Julia dependencies
run: >
julia --project=monorepo -e 'using Pkg; Pkg.develop(path="$(pwd())"); Pkg.develop(path="$(pwd())/lib/ClimaCorePlots")'
Expand All @@ -34,7 +34,7 @@ jobs:
julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCorePlots")'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: climacore-plots-output
path: |
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ClimaCoreSpectra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ name: ClimaCoreSpectra CI
on:
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lib-climacore-spectra:
runs-on: ubuntu-20.04
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v2
- name: Install Julia dependencies
run: >
julia --project=monorepo -e 'using Pkg; Pkg.develop(path="$(pwd())"); Pkg.develop(path="$(pwd())/lib/ClimaCoreSpectra")'
Expand All @@ -34,7 +34,7 @@ jobs:
julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCoreSpectra")'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: climacore-spectra-output
path: |
Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/ClimaCoreTempestRemap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@ name: ClimaCoreTempestRemap CI
on:
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true


jobs:
lib-climacore-tempestremap:
runs-on: ubuntu-20.04
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v2
- name: Install Julia dependencies
run: >
julia --project=monorepo -e 'using Pkg; Pkg.develop(path="$(pwd())"); Pkg.develop(path="$(pwd())/lib/ClimaCoreTempestRemap")'
Expand All @@ -33,7 +34,7 @@ jobs:
julia --project=monorepo -e 'using Pkg; Pkg.test("ClimaCoreTempestRemap")'
&& echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
- name: Upload test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: climacore-tempestremap-output
path: |
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ClimaCoreVTK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ name: ClimaCoreVTK CI
on:
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lib-climacore-vtk:
runs-on: ubuntu-20.04
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v2
- name: Install Paraview
run: |
sudo apt-get update && sudo apt-get -y install paraview python3-paraview
Expand All @@ -42,7 +42,7 @@ jobs:
done
continue-on-error: true
- name: Upload test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: climacore-vtk-output
path: |
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/Downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:
tags: '*'
pull_request:

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -25,7 +30,7 @@ jobs:
- 'ClimaTimeSteppers.jl'
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: julia-actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
- uses: julia-actions/julia-processcoverage@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- name: Install dependencies
Expand Down
6 changes: 2 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ PkgVersion = "eebad327-c553-4316-9ea0-9fa01ccd7688"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Unrolled = "9602ed7d-8fef-5bc8-8597-8f21381861e8"
Expand All @@ -45,8 +44,8 @@ ArgParse = "1"
AssociatedLegendrePolynomials = "1"
BandedMatrices = "0.17, 1"
BenchmarkTools = "1"
BlockArrays = "0.16"
ClimaComms = "0.5.7, 0.6"
BlockArrays = "0.16, 1"
ClimaComms = "0.6"
Combinatorics = "1"
CountFlops = "0.1"
CubedSphere = "0.2"
Expand Down Expand Up @@ -77,7 +76,6 @@ RecursiveArrayTools = "2, 3"
RootSolvers = "0.3, 0.4"
SafeTestsets = "0.1"
SparseArrays = "1"
Static = "0.4, 0.5, 0.6, 0.7, 0.8"
StaticArrays = "1"
Statistics = "1"
StatsBase = "0.34"
Expand Down
2 changes: 1 addition & 1 deletion src/Fields/compat_diffeq.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import RecursiveArrayTools, Static
import RecursiveArrayTools

# for compatibility with OrdinaryDiffEq
# Based on ApproxFun definitions
Expand Down
6 changes: 3 additions & 3 deletions test/Spaces/opt_spaces.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end
if ClimaComms.device(context) isa ClimaComms.CUDADevice
test_n_failures(86, TU.PointSpace, context)
test_n_failures(144, TU.SpectralElementSpace1D, context)
test_n_failures(1119, TU.SpectralElementSpace2D, context)
test_n_failures(1120, TU.SpectralElementSpace2D, context)
test_n_failures(123, TU.ColumnCenterFiniteDifferenceSpace, context)
test_n_failures(123, TU.ColumnFaceFiniteDifferenceSpace, context)
test_n_failures(1125, TU.SphereSpectralElementSpace, context)
Expand All @@ -44,10 +44,10 @@ end
else
test_n_failures(0, TU.PointSpace, context)
test_n_failures(137, TU.SpectralElementSpace1D, context)
test_n_failures(287, TU.SpectralElementSpace2D, context)
test_n_failures(295, TU.SpectralElementSpace2D, context)
test_n_failures(118, TU.ColumnCenterFiniteDifferenceSpace, context)
test_n_failures(118, TU.ColumnFaceFiniteDifferenceSpace, context)
test_n_failures(293, TU.SphereSpectralElementSpace, context)
test_n_failures(301, TU.SphereSpectralElementSpace, context)
test_n_failures(321, TU.CenterExtrudedFiniteDifferenceSpace, context)
test_n_failures(321, TU.FaceExtrudedFiniteDifferenceSpace, context)

Expand Down
Loading