Skip to content

Commit

Permalink
Merge pull request #44 from eco4cast/split-combined
Browse files Browse the repository at this point in the history
Splitting catalog out from scores and dashboard
  • Loading branch information
jzwart authored Feb 28, 2024
2 parents b4ec865 + 7d302e8 commit 070fc8e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 43 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
on:
#schedule:
# - cron: '0 23 * * *'
schedule:
- cron: '0 23 * * *'
workflow_dispatch:

name: catalog

jobs:
docker:
catalog:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
OSN_KEY: ${{ secrets.OSN_KEY }}
OSN_SECRET: ${{ secrets.OSN_SECRET }}
#container: rocker/geospatial:latest
container: eco4cast/rocker-neon4cast:latest
steps:
- run: git config --system --add safe.directory '*'

- uses: actions/checkout@v3
with:
fetch-depth: 0
set-safe-directory: '*'
ref: prod
fetch-depth: 0
set-safe-directory: '*'

- name: install validator
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
run: |
git config user.name github-actions
git config user.email [email protected]
git pull
git add catalog/* .
git commit -a -m "update catalog" || echo "nothing to commit"
git push https://${GITHUB_PAT}:${GITHUB_PAT}@github.com/${GITHUB_REPOSITORY}
38 changes: 2 additions & 36 deletions .github/workflows/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: '0 5 * * *'
workflow_dispatch:

name: submissions-score-dashboard-catalog
name: submissions-score-dashboard

jobs:
submissions:
Expand Down Expand Up @@ -51,42 +51,8 @@ jobs:
run: |
source("scoring/build_score_inventory.R")
catalog:
needs: scores
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
OSN_KEY: ${{ secrets.OSN_KEY }}
OSN_SECRET: ${{ secrets.OSN_SECRET }}
#container: rocker/geospatial:latest
container: eco4cast/rocker-neon4cast:latest
steps:
- run: git config --system --add safe.directory '*'

- uses: actions/checkout@v3
with:
ref: prod
fetch-depth: 0
set-safe-directory: '*'

- name: install validator
run: |
pip install stac-validator
- name: Render
shell: Rscript {0}
run: source("catalog/update_stac.R")

- name: Commit and Push
run: |
git config user.name github-actions
git config user.email [email protected]
git pull
git add catalog/* .
git commit -a -m "update catalog" || echo "nothing to commit"
git push https://${GITHUB_PAT}:${GITHUB_PAT}@github.com/${GITHUB_REPOSITORY}
dashboard:
needs: catalog
needs: scores
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand Down

0 comments on commit 070fc8e

Please sign in to comment.