Skip to content

Commit 5fa8c61

Browse files
committed
Merge branch 'master' of https://github.com/usgs/pestpp into develop
2 parents 589f856 + ee55af1 commit 5fa8c61

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/ci-devenv.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
shell: ${{ matrix.shell }}
2828

2929
steps:
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131

3232
- name: Set Windows ENV
3333
if: runner.os == 'Windows'
3434
uses: ilammy/msvc-dev-cmd@v1
3535

36-
- uses: prefix-dev/setup-pixi@v0.9.2
36+
- uses: prefix-dev/setup-pixi@v0.9.3
3737
with:
3838
pixi-version: v0.58.0
3939
manifest-path: "pixi.toml"
@@ -52,13 +52,13 @@ jobs:
5252
# pixi run test
5353

5454
- name: Upload binaries
55-
uses: actions/upload-artifact@v5
55+
uses: actions/upload-artifact@v6
5656
with:
5757
name: binaries-${{ matrix.os }}
5858
path: bin
5959

6060
- name: Upload test results
61-
uses: actions/upload-artifact@v5
61+
uses: actions/upload-artifact@v6
6262
with:
6363
name: test-results-${{ matrix.os }}
6464
path: benchmarks/large_fake_test/master

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
env: ${{ matrix.env }}
4949

5050
steps:
51-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
5252

5353
# - name: Cache Miniconda
5454
# uses: actions/cache@v2.1.0

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
run:
2525
shell: bash -l {0}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
repository: usgs/pestpp
3030
ref: ${{ inputs.branch }}
3131

32-
- uses: prefix-dev/setup-pixi@v0.9.2
32+
- uses: prefix-dev/setup-pixi@v0.9.3
3333
with:
3434
pixi-version: v0.41.4
3535

@@ -61,7 +61,7 @@ jobs:
6161
rm -r $path/*/ || true
6262
6363
- name: Upload distribution
64-
uses: actions/upload-artifact@v5
64+
uses: actions/upload-artifact@v6
6565
with:
6666
name: pestpp-${{ inputs.version }}-${{ steps.ostag.outputs.ostag }}
6767
path: pestpp-${{ inputs.version }}-${{ steps.ostag.outputs.ostag }}

0 commit comments

Comments
 (0)