-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'osm-americana:main' into peru
- Loading branch information
Showing
2 changed files
with
11 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,32 +85,32 @@ jobs: | |
- name: Wait for PR Preview Upload (1x Sprite) | ||
uses: cygnetdigital/[email protected] | ||
with: | ||
url: "https://preview.ourmap.us/pr/${{ env.PR_NUM }}/sprites/sprite.png" | ||
url: "https://preview.americanamap.org/pr/${{ env.PR_NUM }}/sprites/sprite.png" | ||
responseCode: "200" | ||
timeout: 120000 | ||
interval: 500 | ||
- name: Wait for PR Preview Upload (2x Sprite) | ||
uses: cygnetdigital/[email protected] | ||
with: | ||
url: "https://preview.ourmap.us/pr/${{ env.PR_NUM }}/sprites/[email protected]" | ||
url: "https://preview.americanamap.org/pr/${{ env.PR_NUM }}/sprites/[email protected]" | ||
responseCode: "200" | ||
timeout: 120000 | ||
interval: 500 | ||
- name: Generate Preview text | ||
run: | | ||
echo "## Live PR Preview: | ||
* [Map](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/) | ||
* [Shield Test](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/shieldtest.html) | ||
* [style.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/style.json) | ||
* [shields.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/shields.json) | ||
* [taginfo.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/taginfo.json) | ||
* [Map](https://preview.americanamap.org/pr/${{ env.PR_NUM }}/) | ||
* [Shield Test](https://preview.americanamap.org/pr/${{ env.PR_NUM }}/shieldtest.html) | ||
* [style.json](https://preview.americanamap.org/pr/${{ env.PR_NUM }}/style.json) | ||
* [shields.json](https://preview.americanamap.org/pr/${{ env.PR_NUM }}/shields.json) | ||
* [taginfo.json](https://preview.americanamap.org/pr/${{ env.PR_NUM }}/taginfo.json) | ||
Live previews are automatically removed once the PR is merged. | ||
## Sprite Sheets: | ||
<img src="https://preview.ourmap.us/pr/${{ env.PR_NUM }}/sprites/sprite.png" /> | ||
<img src="https://preview.ourmap.us/pr/${{ env.PR_NUM }}/sprites/[email protected]" /> | ||
<img src="https://preview.americanamap.org/pr/${{ env.PR_NUM }}/sprites/sprite.png" /> | ||
<img src="https://preview.americanamap.org/pr/${{ env.PR_NUM }}/sprites/[email protected]" /> | ||
" > pr_preview.md | ||
[ -f pr_preview-extra.md ] && cat pr_preview-extra.md >> pr_preview.md || echo "No extra PR preview found." | ||
- uses: tibdex/github-app-token@v1 | ||
|
@@ -125,7 +125,7 @@ jobs: | |
sha: ${{ env.PR_SHA }} | ||
token: ${{ steps.checks_token.outputs.token }} | ||
name: PR Preview | ||
details_url: https://preview.ourmap.us/pr/${{ env.PR_NUM }}/ | ||
details_url: https://preview.americanamap.org/pr/${{ env.PR_NUM }}/ | ||
conclusion: neutral | ||
output: | | ||
{"summary":"Preview map changes introduced by this PR", "title":"View live map and artifacts"} | ||
|