Skip to content

Commit f65642b

Browse files
authored
Merge branch 'main' into preview
2 parents 1c5eebe + acc083e commit f65642b

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

.github/workflows/build-book.yaml

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@ on:
6767
ARM_PASSWORD:
6868
description: 'Password for the ARM Data Discovery portal (https://adc.arm.gov/armlive/)'
6969
required: false
70+
AQS_USERNAME:
71+
description: 'Username for the AQS Data Portal'
72+
required: false
73+
AQS_KEY:
74+
description: 'Key for the AQS Data Portal'
75+
required: false
76+
EARTHDATA_USERNAME:
77+
description: 'NASA Earthdata API Username'
78+
required: false
79+
EARTHDATA_PASSWORD:
80+
description: 'NASA Earthdata API Password'
81+
required: false
7082

7183
jobs:
7284
build:
@@ -83,7 +95,7 @@ jobs:
8395
- name: Download code artifact
8496
id: get_code_artifact
8597
if: inputs.build_from_code_artifact == 'true'
86-
uses: dawidd6/action-download-artifact@v3.1.4
98+
uses: dawidd6/action-download-artifact@v6
8799
with:
88100
github_token: ${{ secrets.GITHUB_TOKEN }}
89101
workflow: ${{ inputs.workflow }}
@@ -130,7 +142,7 @@ jobs:
130142
131143
- name: Test for environment change
132144
id: env_change
133-
uses: tj-actions/changed-files@v43
145+
uses: tj-actions/changed-files@v45
134146
with:
135147
files: ${{ inputs.environment_file }}
136148

@@ -139,14 +151,12 @@ jobs:
139151
echo '(DEBUG) The value of steps.env_change.outputs.any_changed is:'
140152
echo ${{ steps.env_change.outputs.any_changed }}
141153
142-
- name: Setup Mambaforge
154+
- name: Setup Miniforge
143155
uses: conda-incubator/setup-miniconda@v3
144156
with:
145-
miniforge-variant: Mambaforge
146157
miniforge-version: latest
147158
python-version: "3.10" # binderbot is failing with python 3.11
148159
activate-environment: ${{ inputs.environment_name }}
149-
use-mamba: true
150160

151161
- name: Set cache date
152162
if: inputs.use_cached_environment == 'true'
@@ -167,9 +177,10 @@ jobs:
167177
|| steps.cache.outputs.cache-hit != 'true')
168178
&& steps.parse_config.outputs.execute_notebooks == 'binder'
169179
run: |
170-
mamba install -c conda-forge jupyter-book pip
171-
pip install sphinx-pythia-theme
180+
conda install -c conda-forge jupyter-book pip
181+
conda install sphinx-pythia-theme
172182
pip install git+https://github.com/pangeo-gallery/binderbot.git
183+
conda list
173184
174185
- name: Update execution environment
175186
if: |
@@ -178,8 +189,8 @@ jobs:
178189
|| steps.env_change.outputs.any_changed == 'true')
179190
&& steps.parse_config.outputs.execute_notebooks != 'binder'
180191
run: |
181-
mamba env update -n ${{ inputs.environment_name }} -f ${{ inputs.environment_file }}
182-
mamba install -c conda-forge sphinxcontrib-applehelp=1.0.4 sphinxcontrib-devhelp=1.0.2 sphinxcontrib-htmlhelp=2.0.1 sphinxcontrib-qthelp=1.0.3 sphinxcontrib-serializinghtml=1.1.5
192+
conda env update -n ${{ inputs.environment_name }} -f ${{ inputs.environment_file }}
193+
conda list
183194
184195
- name: Get paths to notebook files
185196
if: |
@@ -203,6 +214,10 @@ jobs:
203214
env:
204215
ARM_USERNAME: ${{ secrets.ARM_USERNAME }}
205216
ARM_PASSWORD: ${{ secrets.ARM_PASSWORD }}
217+
AQS_USERNAME: ${{ secrets.AQS_USERNAME }}
218+
AQS_KEY: ${{ secrets.AQS_KEY }}
219+
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
220+
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
206221
run: |
207222
NOTEBOOKS=$(cat notebook_paths)
208223
echo 'Retrieved binder_url: ${{ steps.parse_config.outputs.binderhub_url }}'
@@ -217,6 +232,10 @@ jobs:
217232
env:
218233
ARM_USERNAME: ${{ secrets.ARM_USERNAME }}
219234
ARM_PASSWORD: ${{ secrets.ARM_PASSWORD }}
235+
AQS_USERNAME: ${{ secrets.AQS_USERNAME }}
236+
AQS_KEY: ${{ secrets.AQS_KEY }}
237+
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
238+
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
220239
run: |
221240
NOTEBOOKS=$(cat notebook_paths)
222241
echo 'Retrieved binder_url: ${{ steps.parse_config.outputs.binderhub_url }}'
@@ -241,6 +260,10 @@ jobs:
241260
env:
242261
ARM_USERNAME: ${{ secrets.ARM_USERNAME }}
243262
ARM_PASSWORD: ${{ secrets.ARM_PASSWORD }}
263+
AQS_USERNAME: ${{ secrets.AQS_USERNAME }}
264+
AQS_KEY: ${{ secrets.AQS_KEY }}
265+
EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
266+
EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
244267
SECRETS_VARS: ${{ toJson(secrets) }}
245268
run: |
246269
cd ${{ inputs.path_to_notebooks }}

.github/workflows/deploy-book.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# because the artifact is created by a different workflow
4747
- name: Download preview artifact
4848
if: inputs.is_preview == 'true'
49-
uses: dawidd6/action-download-artifact@v3.1.4
49+
uses: dawidd6/action-download-artifact@v6
5050
with:
5151
github_token: ${{ secrets.GITHUB_TOKEN }}
5252
workflow: build-book.yaml

.github/workflows/link-checker.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v4
4545

46-
- name: Setup Mambaforge
46+
- name: Setup Miniforge
4747
uses: conda-incubator/setup-miniconda@v3
4848
with:
49-
miniforge-variant: Mambaforge
5049
miniforge-version: latest
51-
use-mamba: true
5250

5351
- name: Install Jupyterbook
54-
run: mamba install -c conda-forge jupyter-book
52+
run: conda install -c conda-forge jupyter-book
5553

5654
- name: Check for config file
5755
id: check_config

0 commit comments

Comments
 (0)