Merge pull request #1852 from CliMA/gb/update

Sbozzolo · web-flow · commit ea976a617fbb · 2024-07-02T10:12:09.000-07:00
Update compats and github workflows
diff --git a/.github/workflows/ClimaCoreMakie.yml b/.github/workflows/ClimaCoreMakie.yml
@@ -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: >
@@ -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: |
diff --git a/.github/workflows/ClimaCorePlots.yml b/.github/workflows/ClimaCorePlots.yml
@@ -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")'
@@ -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: |
diff --git a/.github/workflows/ClimaCoreSpectra.yml b/.github/workflows/ClimaCoreSpectra.yml
@@ -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")'
@@ -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: |
diff --git a/.github/workflows/ClimaCoreTempestRemap.yml b/.github/workflows/ClimaCoreTempestRemap.yml
@@ -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")'
@@ -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: |
diff --git a/.github/workflows/ClimaCoreVTK.yml b/.github/workflows/ClimaCoreVTK.yml
@@ -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
@@ -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: |
diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml
@@ -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
@@ -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
diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
@@ -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
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -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
diff --git a/Project.toml b/Project.toml
@@ -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"
@@ -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"
@@ -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"
diff --git a/src/Fields/compat_diffeq.jl b/src/Fields/compat_diffeq.jl
@@ -1,4 +1,4 @@
-import RecursiveArrayTools, Static
+import RecursiveArrayTools
 
 # for compatibility with OrdinaryDiffEq
 # Based on ApproxFun definitions
diff --git a/test/Spaces/opt_spaces.jl b/test/Spaces/opt_spaces.jl
@@ -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)
@@ -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)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import RecursiveArrayTools, Static`
	`1`	`+import RecursiveArrayTools`
`2`	`2`
`3`	`3`	`# for compatibility with OrdinaryDiffEq`
`4`	`4`	`# Based on ApproxFun definitions`