Skip to content

Commit ec9bc15

Browse files
weiji14weiji14
authored
Merge branch 'main' into css-thumbnail-size
2 parents f06f541 + eaf2c10 commit ec9bc15

32 files changed

+331
-102
lines changed

‎.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
# Checkout current git repository
2121
- name: Checkout
22-
uses: actions/checkout@v2.3.4
22+
uses: actions/checkout@v2.3.5
2323
with:
2424
# fecth all history so that setuptools-scm works
2525
fetch-depth: 0

‎.github/workflows/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: Checkout the repository
18-
uses: actions/checkout@v2.3.4
18+
uses: actions/checkout@v2.3.5
1919
with:
2020
path: repository
2121

2222
- name: Checkout the documentation
23-
uses: actions/checkout@v2.3.4
23+
uses: actions/checkout@v2.3.5
2424
with:
2525
ref: gh-pages
2626
path: documentation

‎.github/workflows/ci_docs.yml

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

5050
# Checkout current git repository
5151
- name: Checkout
52-
uses: actions/checkout@v2.3.4
52+
uses: actions/checkout@v2.3.5
5353
with:
5454
# fecth all history so that setuptools-scm works
5555
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Download cached remote files (artifacts) from GitHub
8282
- name: Download remote data from GitHub
83-
uses: dawidd6/action-download-artifact@v2.14.1
83+
uses: dawidd6/action-download-artifact@v2.15.0
8484
with:
8585
workflow: cache_data.yaml
8686
workflow_conclusion: success
@@ -107,7 +107,7 @@ jobs:
107107
run: make -C doc clean all
108108

109109
- name: Checkout the gh-pages branch
110-
uses: actions/checkout@28c7f3d2b5162b5ddd3dfd9a45aa55eaf396478b
110+
uses: actions/checkout@v2.3.5
111111
with:
112112
ref: gh-pages
113113
# Checkout to this folder instead of the current one

‎.github/workflows/ci_tests.yaml

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

7373
# Checkout current git repository
7474
- name: Checkout
75-
uses: actions/checkout@v2.3.4
75+
uses: actions/checkout@v2.3.5
7676
with:
7777
# fecth all history so that setuptools-scm works
7878
fetch-depth: 0
@@ -96,7 +96,7 @@ jobs:
9696
mamba install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
9797
pandas xarray netCDF4 packaging \
9898
${{ matrix.optional-packages }} \
99-
dvc=2.3.0 make pytest>=6.0 \
99+
dvc make pytest>=6.0 \
100100
pytest-cov pytest-mpl sphinx-gallery tomli
101101
102102
# Show installed pkg information for postmortem diagnostic
@@ -105,7 +105,7 @@ jobs:
105105

106106
# Download cached remote files (artifacts) from GitHub
107107
- name: Download remote data from GitHub
108-
uses: dawidd6/action-download-artifact@v2.14.1
108+
uses: dawidd6/action-download-artifact@v2.15.0
109109
with:
110110
workflow: cache_data.yaml
111111
workflow_conclusion: success

‎.github/workflows/ci_tests_dev.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Checkout current git repository
4747
- name: Checkout
48-
uses: actions/checkout@v2.3.4
48+
uses: actions/checkout@v2.3.5
4949
if: github.event_name != 'repository_dispatch'
5050
with:
5151
# fecth all history so that setuptools-scm works
@@ -62,12 +62,12 @@ jobs:
6262

6363
# Checkout the pull request branch
6464
- name: Checkout
65-
uses: actions/checkout@v2
65+
uses: actions/checkout@v2.3.5
6666
if: github.event_name == 'repository_dispatch'
6767
with:
6868
token: ${{ steps.generate-token.outputs.token }}
6969
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
70-
ref: ${{ github.event.client_payload.pull_request.head.ref }}
70+
ref: ${{ github.event.pull_request.head.sha }}
7171
# fecth all history so that setuptools-scm works
7272
fetch-depth: 0
7373

@@ -88,7 +88,7 @@ jobs:
8888
- name: Install dependencies
8989
run: |
9090
mamba install ninja cmake libblas libcblas liblapack fftw gdal geopandas \
91-
ghostscript libnetcdf hdf5 zlib curl pcre make dvc=2.3.0
91+
ghostscript libnetcdf hdf5 zlib curl pcre make dvc
9292
pip install --pre numpy pandas xarray netCDF4 packaging \
9393
ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery \
9494
tomli
@@ -107,7 +107,7 @@ jobs:
107107

108108
# Download cached remote files (artifacts) from GitHub
109109
- name: Download remote data from GitHub
110-
uses: dawidd6/action-download-artifact@v2.14.1
110+
uses: dawidd6/action-download-artifact@v2.15.0
111111
with:
112112
workflow: cache_data.yaml
113113
workflow_conclusion: success

‎.github/workflows/dvc-diff.yml

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

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2.3.4
16+
uses: actions/checkout@v2.3.5
1717
with:
1818
# fetch all history so that dvc diff works
1919
fetch-depth: 0

‎.github/workflows/format-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
private_key: ${{ secrets.APP_PRIVATE_KEY }}
1515

1616
# Checkout the pull request branch
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v2.3.5
1818
with:
1919
token: ${{ steps.generate-token.outputs.token }}
2020
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
21-
ref: ${{ github.event.client_payload.pull_request.head.ref }}
21+
ref: ${{ github.event.pull_request.head.sha }}
2222

2323
# Setup Python environment
2424
- uses: actions/setup-python@v2.2.2

‎.github/workflows/publish-to-pypi.yml

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

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v2.3.4
26+
uses: actions/checkout@v2.3.5
2727
with:
2828
# fetch all history so that setuptools-scm works
2929
fetch-depth: 0

‎.github/workflows/release-baseline-images.yml

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

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v2.3.4
19+
uses: actions/checkout@v2.3.5
2020

2121
- name: Setup data version control (DVC)
2222
uses: iterative/setup-dvc@v1.0.3

‎.github/workflows/style_checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
# Checkout current git repository
1818
- name: Checkout
19-
uses: actions/checkout@v2.3.4
19+
uses: actions/checkout@v2.3.5
2020

2121
# Setup Miniconda
2222
- name: Set up Python

0 commit comments

Comments
 (0)