Skip to content

Commit add300c

Browse files
Merge pull request #364 from CliMA/ck/nvtx
Update NVTX compat and dependencies
2 parents 2bd65cc + 8c7320e commit add300c

File tree

7 files changed

+398
-409
lines changed

7 files changed

+398
-409
lines changed

.buildkite/Manifest.toml

Lines changed: 210 additions & 190 deletions
Large diffs are not rendered by default.

.buildkite/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CUDA = "5"
4444
ClimaComms = "0.6"
4545
ClimaCore = "0.14"
4646
ClimaCorePlots = "0.2"
47-
ClimaTimeSteppers = "0.7"
47+
ClimaTimeSteppers = "0.7, 0.8"
4848
DataStructures = "0.18"
4949
DiffEqBase = "6"
5050
DiffEqCallbacks = "4"

.dev/Manifest.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.10.7"
3+
julia_version = "1.10.9"
44
manifest_format = "2.0"
55
project_hash = "b280bcf3b481823c97fa1a62c1b5e65114b8fa18"
66

@@ -39,9 +39,9 @@ version = "4.1.1"
3939

4040
[[deps.DataStructures]]
4141
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
42-
git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82"
42+
git-tree-sha1 = "4e1fe97fdaed23e9dc21d4d664bea76b65fc50a0"
4343
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
44-
version = "0.18.20"
44+
version = "0.18.22"
4545

4646
[[deps.Dates]]
4747
deps = ["Printf"]
@@ -67,9 +67,9 @@ deps = ["Base64"]
6767
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
6868

6969
[[deps.OrderedCollections]]
70-
git-tree-sha1 = "12f1439c4f986bb868acda6ea33ebc78e19b95ad"
70+
git-tree-sha1 = "cc4054e898b852042d7b503313f7ad03de99c3dd"
7171
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
72-
version = "1.7.0"
72+
version = "1.8.0"
7373

7474
[[deps.PrecompileTools]]
7575
deps = ["Preferences"]

.github/workflows/CodeCov.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
99
cancel-in-progress: true
1010

11+
# Needed to allow julia-actions/cache to delete old caches that it has created
12+
permissions:
13+
actions: write
14+
contents: read
15+
1116
jobs:
1217
test:
1318
name: ci ${{ matrix.version }} - ${{ matrix.os }}
@@ -28,20 +33,11 @@ jobs:
2833
with:
2934
version: ${{ matrix.version }}
3035
arch: ${{ matrix.arch }}
31-
- uses: actions/cache@v1
32-
env:
33-
cache-name: cache-artifacts
34-
with:
35-
path: ~/.julia/artifacts
36-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
37-
restore-keys: |
38-
${{ runner.os }}-test-${{ env.cache-name }}-
39-
${{ runner.os }}-test-
40-
${{ runner.os }}-
36+
- uses: julia-actions/cache@v2
4137
- uses: julia-actions/julia-buildpkg@v1
4238
- uses: julia-actions/julia-runtest@v1
4339
- uses: julia-actions/julia-processcoverage@v1
44-
- uses: codecov/codecov-action@v1
40+
- uses: codecov/codecov-action@v5
4541
with:
4642
file: lcov.info
4743
token: ${{secrets.CODECOV_TOKEN}}

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ClimaTimeSteppers"
22
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
33
authors = ["Climate Modeling Alliance"]
4-
version = "0.8.2"
4+
version = "0.8.3"
55

66
[deps]
77
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
@@ -41,7 +41,7 @@ Krylov = "0.8, 0.9"
4141
LinearAlgebra = "1"
4242
LinearOperators = "2"
4343
MPI = "0.20"
44-
NVTX = "0.3"
44+
NVTX = "0.3, 1"
4545
ODEConvergenceTester = "0.2"
4646
OrderedCollections = "1"
4747
PrettyTables = "2"

0 commit comments

Comments
 (0)