diff --git a/.github/calcrom/calcrom.py b/.github/calcrom/calcrom.py index 9d04339a30..7b9523c072 100644 --- a/.github/calcrom/calcrom.py +++ b/.github/calcrom/calcrom.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import json import struct import argparse @@ -41,7 +43,6 @@ def main(self): for seg in nef.iter_segments() if seg['p_memsz'] != 0 ) - print(programs) for command in commands: cmdstr = command['command'] if 'mwrap mwasmarm' in cmdstr: diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh index 0266069263..3023cf5316 100755 --- a/.github/calcrom/webhook.sh +++ b/.github/calcrom/webhook.sh @@ -6,11 +6,6 @@ if [[ "$GITHUB_REF" != "refs/heads/main" || "$GITHUB_EVENT_NAME" != "push" ]]; t fi url="$1" -map_file="$2" -if [ ! -f $map_file ]; then - echo "$map_file does not exist!" - exit 1 -fi output=$(${GITHUB_WORKSPACE}/.github/calcrom/calcrom.py ${GITHUB_WORKSPACE}/build | 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 206a6c7e94..dbc8f7cf59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: env: arm9name: build/ run: | - .github/calcrom/webhook.sh "$CALCROM_WEBHOOK_URL" "$GITHUB_WORKSPACE/build/main.nef.xMAP" + .github/calcrom/webhook.sh "$CALCROM_WEBHOOK_URL" continue-on-error: true - name: Post error archive