Skip to content

Commit 0a268f8

Browse files
authored
Merge branch 'main' into rajeeja/scalardotgradient_539
2 parents f176807 + 29da953 commit 0a268f8

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/asv-benchmarking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
path: uxarray-asv
3939

4040
- name: Setup Miniforge
41-
uses: conda-incubator/setup-miniconda@v3
41+
uses: conda-incubator/setup-miniconda@v4
4242
with:
4343
miniforge-version: "24.1.2-0"
4444
activate-environment: asv

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
token: ${{ github.token }}
3535

3636
- name: conda_setup (x64)
37-
uses: conda-incubator/setup-miniconda@v3
37+
uses: conda-incubator/setup-miniconda@v4
3838
if: matrix.os != 'macos-14'
3939
with:
4040
activate-environment: uxarray_build
@@ -46,7 +46,7 @@ jobs:
4646
miniforge-version: latest
4747

4848
- name: conda_setup (ARM64)
49-
uses: conda-incubator/setup-miniconda@v3
49+
uses: conda-incubator/setup-miniconda@v4
5050
if: matrix.os == 'macos-14'
5151
with:
5252
activate-environment: uxarray_build

.github/workflows/upstream-dev-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
shell: bash -l {0}
7171
steps:
7272
- name: checkout
73-
uses: actions/checkout@v6.0.2
73+
uses: actions/checkout@v6
7474

7575
- name: Create or update failure issue
7676
shell: bash

.github/workflows/yac-optional.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
2828
steps:
2929
- name: checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
token: ${{ github.token }}
3333

3434
- name: conda_setup
35-
uses: conda-incubator/setup-miniconda@v3
35+
uses: conda-incubator/setup-miniconda@v4
3636
with:
3737
activate-environment: uxarray_build
3838
channel-priority: strict

0 commit comments

Comments
 (0)