Skip to content

Commit

Permalink
Fix nanomaps render failures (#27453)
Browse files Browse the repository at this point in the history
* Prevent Nanomaps Render failure if no changes

* Catch stderr, do not fail with 78

* This does not apply here
  • Loading branch information
m-dzianishchyts authored Nov 27, 2024
1 parent 483f937 commit 45a3303
Showing 1 changed file with 30 additions and 29 deletions.
59 changes: 30 additions & 29 deletions .github/workflows/render_nanomaps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,45 @@
name: 'Render Nanomaps'
on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'
workflow_dispatch:

jobs:
generate_maps:
name: 'Generate NanoMaps'
runs-on: ubuntu-22.04
steps:
- id: create_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
- id: create_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}

- run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
- run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"

- name: 'Update Branch'
uses: actions/checkout@v4
with:
token: ${{ steps.create_token.outputs.token }}
- name: 'Update Branch'
uses: actions/checkout@v4
with:
token: ${{ steps.create_token.outputs.token }}

- name: Branch
run: |
git branch -f nanomap-render
git checkout nanomap-render
git reset --hard origin/master
- name: Branch
run: |
git branch -f nanomap-render
git checkout nanomap-render
git reset --hard origin/master
- name: 'Generate Maps'
run: './tools/github-actions/nanomap-renderer-invoker.sh'
- name: 'Generate Maps'
run: './tools/github-actions/nanomap-renderer-invoker.sh'

- name: 'Commit Maps and open PR'
run: |
git config --local user.email "[email protected]"
git config --local user.name "NanoMap Generation"
git pull origin master
git commit -m "NanoMap Auto-Update (`date`)" -a || true
git push -f -u origin nanomap-render
result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master")
if echo "$result" | grep -q "No commits between master and nanomap-render"
echo "No NanoMaps update required, skipping."
exit 78
- name: 'Commit Maps and open PR'
run: |
git config --local user.email "[email protected]"
git config --local user.name "NanoMap Generation"
git pull origin master
git commit -m "NanoMap Auto-Update (`date`)" -a || true
git push -f -u origin nanomap-render
result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master" 2>&1) || true
echo "$result"
if echo "$result" | grep -q "No commits between master and nanomap-render"; then
echo "No NanoMaps update required, skipping."
fi

0 comments on commit 45a3303

Please sign in to comment.