From e559c1b20ca53e021d076000ca6784c1bb2f496c Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Thu, 26 Nov 2020 05:37:23 -0800 Subject: [PATCH] Theoretically make nanomaps work via PR --- .github/workflows/render_nanomaps.yml | 32 ++++++++++++++++++--------- maps/_map_system_readme.dm | 2 +- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml index 6ed50e1f5a9..f3a50a5e942 100644 --- a/.github/workflows/render_nanomaps.yml +++ b/.github/workflows/render_nanomaps.yml @@ -16,25 +16,37 @@ jobs: name: 'Generate NanoMaps' runs-on: ubuntu-18.04 steps: - - name: 'Update Branch' + - name: Clone uses: actions/checkout@v2 - with: - fetch-depth: 1 + + - name: Branch + run: | + git fetch origin + git branch -f nanomaps_generation + git checkout nanomaps_generation + git reset --hard origin/master - name: Ensure +x on github-actions directory - run: | - chmod -R +x ./tools/github-actions + run: chmod -R +x ./tools/github-actions - - name: 'Generate Maps' + - name: Generate Maps run: './tools/github-actions/nanomap-renderer-invoker.sh' - - name: 'Commit Maps' + - name: Commit Maps run: | git config --local user.email "action@github.com" git config --local user.name "NanoMap Generation" - git pull origin master + git add . git commit -m "NanoMap Auto-Update (`date`)" -a || true - - name: 'Push Maps' - uses: ad-m/github-push-action@master + git push -f -u origin nanomaps_generation + + - name: Create Pull Request + uses: repo-sync/pull-request@v2 with: + source_branch: "nanomaps_generation" + destination_branch: "master" + pr_title: "Automatic NanoMap Update" + pr_body: "This pull request updates the nanomap images to the latest version of the map." + pr_label: "Infrastructure" + pr_allow_empty: false github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/maps/_map_system_readme.dm b/maps/_map_system_readme.dm index 95e996907ba..e97445241df 100644 --- a/maps/_map_system_readme.dm +++ b/maps/_map_system_readme.dm @@ -10,7 +10,7 @@ things, such as areas, elevators, or shuttles. Generally, the layout is that yo (optional) [map_name]_areas/structures/whatever.dm - Files for unique things to that map. [map_name]-1.dmm - Your actual map files. Z-levels should be ordered correctly if you seperate your z-levels across map files. --HOW TO LOAD A SPECIFIC MAP- +- HOW TO LOAD A SPECIFIC MAP - Say you want to load southern_cross, First, uncheck your current loaded map, presumably northern_star. Uncheck northern_star.dm inside northern_star folder. Then go open southern_cross folder, and check southern_cross.dm, don't check any other folders below, and compile.