From 0b31ed71345f43d3d22bd7c924019073187aec51 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 8 Nov 2024 13:50:07 -0800 Subject: [PATCH] Fix xMAP in CI build, filter out runs if only changing Markdown docs --- .github/calcrom/webhook.sh | 5 ++-- .github/workflows/build.yml | 53 ++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh index 5c97960543..320bb7e8b3 100755 --- a/.github/calcrom/webhook.sh +++ b/.github/calcrom/webhook.sh @@ -9,6 +9,7 @@ fi url="$1" build_name="platinum.us" +build_dir="$2" -output=$(${GITHUB_WORKSPACE}/.github/calcrom/calcrom.py /var/tmp/pokeplatinum | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') -curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $url +output=$("${GITHUB_WORKSPACE}"/.github/calcrom/calcrom.py "$build_dir" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') +curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST "$url" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c6b567861..8407f18ee2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,11 @@ name: build on: push: branches: [ main ] + paths-ignore: + - '**.md' pull_request: + paths-ignore: + - '**.md' env: LM_LICENSE_FILE: "${{ github.workspace }}/tools/cw/license.dat" @@ -14,8 +18,9 @@ env: jobs: build: + permissions: + contents: write runs-on: ubuntu-22.04 - steps: - name: Install Software run: | @@ -41,9 +46,31 @@ jobs: env: arm9name: ${{ vars.BUILD }} run: | - .github/calcrom/webhook.sh "$CALCROM_WEBHOOK_URL" + .github/calcrom/webhook.sh "$CALCROM_WEBHOOK_URL" "$BUILD" continue-on-error: true + - name: Checkout xMAP + if: ${{ github.event_name == 'push' }} + uses: actions/checkout@v4 + with: + path: 'xmap' + ref: 'xmap' + + - name: Move xMAP + if: ${{ github.event_name == 'push' }} + run: | + mkdir -p xmap + cp "$BUILD"/*.xMAP xmap/platinumus.xMAP + echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV + + - name: Update xMAP + if: ${{ github.event_name == 'push' }} + uses: EndBug/add-and-commit@v9 + with: + cwd: "./xmap" + add: "*.xMAP" + message: ${{ env.XMAP_COMMIT_MSG }} + - name: Post error archive if: failure() continue-on-error: true @@ -56,25 +83,3 @@ jobs: name: pokeplatinum-failure-${{ github.run_id }} path: failure.tar.gz retention-days: 1 - - - name: Checkout xMAP - if: ${{ github.event_name == 'push' }} - uses: actions/checkout@v4 - with: - path: 'xmap' - ref: 'xmap' - - - name: Move xMAP - if: ${{ github.event_name == 'push' }} - run: | - mkdir -p xmap - cp "$BUILD/*.xMAP" xmap/platinumus.xMAP - echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV - - - name: Update xMAP - if: ${{ github.event_name == 'push' }} - uses: EndBug/add-and-commit@v9 - with: - cwd: "./xmap" - add: "*.xMAP" - message: ${{ env.XMAP_COMMIT_MSG }}