Skip to content

Commit

Permalink
Merge branch 'main' into index
Browse files Browse the repository at this point in the history
  • Loading branch information
scottyhq authored Mar 14, 2024
2 parents e667d2f + 221049e commit 3b20e39
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 125 deletions.
38 changes: 0 additions & 38 deletions .github/workflows/binder-badge.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/build_website.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
pull_request_target:
types: [labeled, synchronize]
paths:
- '.github/**'
- '.github/**/*'
- '{{ cookiecutter.repo_directory }}/**'
- 'book/**'
- 'book/**/*'
- 'conda/**'
- 'scripts/**'
- 'cookiecutter.yaml'
Expand All @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ on:
- '{{ cookiecutter.repo_directory }}/**'
- 'scripts/**'
- '.github/workflows/deploy.yaml'
- '.github/actions/**'
- 'cookiecutter.yaml'

branches:
- main

jobs:
build-and-deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure NASA Earthdata Login
continue-on-error: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:

jobs:
build-and-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure NASA Earthdata Login
continue-on-error: true
env:
Expand All @@ -19,7 +19,7 @@ jobs:
run: |
echo "machine urs.earthdata.nasa.gov login $EARTHDATA_USER password $EARTHDATA_PASS" > ~/.netrc
chmod 0600 ~/.netrc
- uses: ./.github/actions/buildresources
with:
jb-cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qaqc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
quality-control:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
defaults:
run:
shell: bash -l {0}
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/repo2docker-PR.yaml

This file was deleted.

46 changes: 0 additions & 46 deletions .github/workflows/repo2docker.yaml

This file was deleted.

0 comments on commit 3b20e39

Please sign in to comment.