Skip to content

Commit 1e09a3a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into FEATURE_chardata
2 parents d1619f7 + c2ffc9b commit 1e09a3a

35 files changed

Lines changed: 1255 additions & 522 deletions

File tree

.github/workflows/benchmarks_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
if: needs.download.outputs.reports_exist == 1
8484
steps:
8585
- name: Checkout repo
86-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
86+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
8787
with:
8888
persist-credentials: false
8989

@@ -95,7 +95,7 @@ jobs:
9595

9696
- name: Set up Python
9797
# benchmarks/bm_runner.py only needs builtins to run.
98-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
98+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1
9999

100100
- name: Post reports
101101
env:

.github/workflows/benchmarks_run.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
overnight: ${{ steps.overnight.outputs.check }}
3838
branch: ${{ steps.branch.outputs.check }}
3939
steps:
40-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
40+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
4141
with:
4242
fetch-depth: 2
4343
persist-credentials: false
@@ -81,7 +81,7 @@ jobs:
8181
steps:
8282
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
8383
- name: Checkout repo
84-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
84+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
8585
with:
8686
fetch-depth: 0
8787
persist-credentials: false
@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Cache environment directories
9393
id: cache-env-dir
94-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
94+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
9595
with:
9696
path: |
9797
.nox
@@ -101,7 +101,7 @@ jobs:
101101

102102
- name: Cache test data directory
103103
id: cache-test-data
104-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
104+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
105105
with:
106106
path: |
107107
${{ env.IRIS_TEST_DATA_PATH }}

.github/workflows/benchmarks_validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout repo
36-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
36+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
3737
with:
3838
fetch-depth: 0
3939
persist-credentials: false
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Restore environment cache
4545
id: cache-restore
46-
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae
46+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
4747
with:
4848
path: |
4949
.nox
@@ -58,7 +58,7 @@ jobs:
5858
# Security: PRs are potentially malformed/malicious, so only allow runs on trunk
5959
# branches to update the cache, to avoid cache poisoning.
6060
if: github.event_name == 'push'
61-
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae
61+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
6262
with:
6363
path: |
6464
.nox

.github/workflows/ci-citation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: "validate"
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
29+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
3030
with:
3131
fetch-depth: 0
3232
persist-credentials: false

.github/workflows/ci-linkchecks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
issues: write # required for peter-evans/create-issue-from-file
2222

2323
steps:
24-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
24+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
2525
with:
2626
fetch-depth: 0
2727
persist-credentials: false

.github/workflows/ci-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- name: "checkout"
62-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
62+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
6363
with:
6464
fetch-depth: 0
6565
persist-credentials: false

.github/workflows/ci-wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: "build sdist & wheel"
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
34+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
3535
with:
3636
fetch-depth: 0
3737
persist-credentials: false
@@ -61,7 +61,7 @@ jobs:
6161
env:
6262
ENV_NAME: "ci-wheels"
6363
steps:
64-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
64+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
6565
with:
6666
fetch-depth: 0
6767
persist-credentials: false

.github/workflows/composite/cartopy-cache/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ inputs:
2020
runs:
2121
using: "composite"
2222
steps:
23-
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
23+
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
2424
id: cartopy-cache
2525
with:
2626
path: ~/.local/share/cartopy

.github/workflows/composite/conda-env-cache/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
runs:
2424
using: "composite"
2525
steps:
26-
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
26+
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
2727
id: conda-env-cache
2828
with:
2929
path: ${{ env.CONDA }}/envs/${{ inputs.env_name }}

.github/workflows/composite/conda-pkg-cache/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ inputs:
1616
runs:
1717
using: "composite"
1818
steps:
19-
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae
19+
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
2020
with:
2121
path: ~/conda_pkgs_dir
2222
key: ${{ runner.os }}-conda-pkgs-${{ inputs.env_name }}-p${{ inputs.cache_period }}-b${{ inputs.cache_build }}

0 commit comments

Comments
 (0)