diff --git a/.github/workflows/catalog.yaml b/.github/workflows/catalog.yaml index 2012bed79d..dfb12685a1 100644 --- a/.github/workflows/catalog.yaml +++ b/.github/workflows/catalog.yaml @@ -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: | @@ -34,7 +34,7 @@ jobs: run: | git config user.name github-actions git config user.email github-actions@github.com + 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} - diff --git a/.github/workflows/combined.yaml b/.github/workflows/combined.yaml index 29cd3702a6..83c5d33b25 100644 --- a/.github/workflows/combined.yaml +++ b/.github/workflows/combined.yaml @@ -5,7 +5,7 @@ on: - cron: '0 5 * * *' workflow_dispatch: -name: submissions-score-dashboard-catalog +name: submissions-score-dashboard jobs: submissions: @@ -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 github-actions@github.com - 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 }}