From 3d7fe60f44dfb8017b44818c832593cb0ba80295 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 1 Jan 2025 19:14:31 -0800 Subject: [PATCH] Setup venv in CI build + remove calcrom invocation --- .github/workflows/build.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8407f18ee2..e92b7b9cd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,16 +11,14 @@ on: env: LM_LICENSE_FILE: "${{ github.workspace }}/tools/cw/license.dat" - CALCROM_DISCORD_WEBHOOK_AVATAR_URL: "https://i.imgur.com/38BQHdd.png" - CALCROM_DISCORD_WEBHOOK_USERNAME: "OK" - CALCROM_WEBHOOK_URL: "${{ secrets.WEBHOOKURL }}" BUILD: /var/tmp/pokeplatinum + WINEARCH: win32 jobs: build: permissions: contents: write - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Install Software run: | @@ -29,8 +27,7 @@ jobs: sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources sudo dpkg --add-architecture i386 sudo apt-get update -y - sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable binutils-arm-none-eabi gcc-arm-none-eabi flex bison - pip install --user meson pyelftools + sudo apt-get install -y --install-recommends python3-pip wine32:i386 binutils-arm-none-eabi gcc-arm-none-eabi flex bison - name: Checkout Repo uses: actions/checkout@v2 @@ -41,14 +38,6 @@ jobs: - name: Build Repo run: make check - - name: Webhook - if: ${{ github.event_name == 'push' }} - env: - arm9name: ${{ vars.BUILD }} - run: | - .github/calcrom/webhook.sh "$CALCROM_WEBHOOK_URL" "$BUILD" - continue-on-error: true - - name: Checkout xMAP if: ${{ github.event_name == 'push' }} uses: actions/checkout@v4