Skip to content

Commit 7e2a624

Browse files
authored
Merge pull request #53 from NASA-Openscapes/neon-packages
Add packages for NEON workshop
2 parents 6f407fe + 2bb8d13 commit 7e2a624

4 files changed

Lines changed: 469 additions & 330 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,27 @@ on:
1212
- '!ci/environment.yml'
1313
- '.github/workflows/build.yml'
1414

15-
workflow_run:
16-
workflows: ["update conda lockfile"]
17-
types:
18-
- completed
15+
pull_request:
16+
branches:
17+
- main
18+
- dev
19+
paths:
20+
# build if anything in ci/ changes except only environment.yml because
21+
# environment-lock.yml needs to be built first by create-conda-lock.yml
22+
- 'ci/**'
23+
- '!ci/environment.yml'
24+
- '.github/workflows/build.yml'
1925

2026
workflow_dispatch:
2127

2228
jobs:
2329
build-and-push-docker:
24-
if: ${{ github.event_name == 'push' || github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch'}}
2530
runs-on: ubuntu-latest
2631
defaults:
2732
run:
2833
shell: bash -l {0}
2934
steps:
30-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v4
3136

3237
- name: "Set Job Environment Variables"
3338
run: |

.github/workflows/create-conda-lock.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: checkout repo
25-
uses: actions/checkout@main
25+
uses: actions/checkout@v4
26+
with:
27+
ref: ${{ github.head_ref }}
2628
- name: install conda-lock with micromamba
2729
uses: mamba-org/setup-micromamba@main
2830
with:
@@ -40,7 +42,7 @@ jobs:
4042
run: |
4143
if [[ $(git ls-files --modified) ]]; then
4244
git config --global user.name 'ateucher'
43-
git config --global user.email 'andy.teucher@gmail.com'
45+
git config --global user.email '2816635+ateucher@users.noreply.github.com'
4446
git commit --all --message "[bot] autogenerated conda-lock files"
4547
git push
4648
fi

0 commit comments

Comments
 (0)