From e5937ca62a1532b830745ead94564557829704e1 Mon Sep 17 00:00:00 2001 From: bbbbbr Date: Mon, 12 May 2025 11:50:39 -0700 Subject: [PATCH 1/4] Build: Update Mac runner ver, add ARM --- .github/workflows/build.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b6f8ef..7b813aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,12 @@ jobs: matrix: include: - os: ubuntu-22.04 - name: Linux-x64 - - os: macos-11 + name: Linux-Wincross-x64 + - os: ubuntu-22.04-arm + name: Linux-arm64 + - os: macos-14 + name: MacOS-arm64 + - os: macos-13 name: MacOS-x64 steps: @@ -25,7 +29,7 @@ jobs: # ==== OS Specific Dependencies ==== - name: Linux Depends - if: matrix.name == 'Linux-x64' + if: matrix.name == 'Linux-Wincross-x64' # For Windows crossbuild # Use "x64" for 64 bit (x86_64-w64-mingw32-gcc), "x86" for 32 bit (i686-w64-mingw32-gcc) uses: egor-tensin/setup-mingw@v2 @@ -40,16 +44,16 @@ jobs: submodules: false # ==== Builds ==== - - name: Build MacOS - if: (matrix.name == 'MacOS-x64') + - name: Build single OS + if: (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64') || (matrix.name == 'Linux-arm64') shell: bash run: | cd gbtoolsid-root make macoszip cd .. - - name: Build Linux - if: (matrix.name == 'Linux-x64') + - name: Build Linux + WinCross + if: (matrix.name == 'Linux-Wincross-x64') shell: bash run: | cd gbtoolsid-root @@ -59,8 +63,7 @@ jobs: cd .. # ==== Packaging ==== - - name: Package build Linux/MacOS - if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') + - name: Package build shell: bash run: | cd gbtoolsid-root @@ -70,19 +73,9 @@ jobs: cd .. - name: Store build - if: (matrix.name == 'Linux-x64') uses: actions/upload-artifact@v4 with: - name: gbtoolsid build Linux & Windows - # path: gbtoolsid-root/bin/${{ env.BUILD_PACKAGE_FILENAME }} - path: gbtoolsid-root/bin - # retention-days: 30 - - - name: Store build - if: (matrix.name == 'MacOS-x64') - uses: actions/upload-artifact@v4 - with: - name: gbtoolsid build MacOS + name: gbtoolsid build ${{ matrix.name }} # path: gbtoolsid-root/bin/${{ env.BUILD_PACKAGE_FILENAME }} path: gbtoolsid-root/bin # retention-days: 30 From 1e477f28fd74885ccfa9ddd98d85b41be3a1bb1b Mon Sep 17 00:00:00 2001 From: bbbbbr Date: Mon, 12 May 2025 12:00:32 -0700 Subject: [PATCH 2/4] Makefile: arm zip targets --- Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile b/Makefile index f152322..c7ab202 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,11 @@ macoszip: macos zip -j $(BIN)_macos.zip $(BIN) Changelog.md README.md mv $(BIN)_macos.zip bin +macos_armzip: macos + mkdir -p bin + # -j discards (junks) path to file + zip -j $(BIN)_macos_arm.zip $(BIN) Changelog.md README.md + mv $(BIN)_macos_arm.zip bin linuxzip: linux mkdir -p bin @@ -60,6 +65,12 @@ linuxzip: linux zip -j $(BIN)_linux.zip $(BIN) Changelog.md README.md mv $(BIN)_linux.zip bin +linux_armzip: linux + mkdir -p bin + # -j discards (junks) path to file + zip -j $(BIN)_linux_arm.zip $(BIN) Changelog.md README.md + mv $(BIN)_linux_arm.zip bin + wincrosszip: wincross mkdir -p bin # -j discards (junks) path to file From d1d0d82e86072c208dff941a7a85c09df9a3a5a8 Mon Sep 17 00:00:00 2001 From: bbbbbr Date: Mon, 12 May 2025 12:02:22 -0700 Subject: [PATCH 3/4] Changelog: 1.5.1 --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index c4593dd..0948f19 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,11 @@ Changelog ========= +# Version 1.5.1 +- Detect GBSDK +- Improve GBStudio detection and version numbers +- Linux and Mac Arm64 builds + # Version 1.5.0 - Detect GBDK 4.3.0+ - Update GBStudio 3.2.0 due to using an interim build between GBDK 4.2.0 and 4.3.0 From eda94e5dcc2ab581e229b515966d6d6a2163babe Mon Sep 17 00:00:00 2001 From: bbbbbr Date: Mon, 12 May 2025 12:03:48 -0700 Subject: [PATCH 4/4] Build: Arm zips --- .github/workflows/build.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b813aa..231e683 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,15 +44,31 @@ jobs: submodules: false # ==== Builds ==== - - name: Build single OS - if: (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64') || (matrix.name == 'Linux-arm64') + - name: Build Mac x64 + if: (matrix.name == 'MacOS-x64') shell: bash run: | cd gbtoolsid-root make macoszip cd .. - - name: Build Linux + WinCross + - name: Build Mac Arm64 + if: (matrix.name == 'MacOS-arm64') + shell: bash + run: | + cd gbtoolsid-root + make macos_armzip + cd .. + + - name: Build Linux Arm64 + if: (matrix.name == 'Linux-arm64') + shell: bash + run: | + cd gbtoolsid-root + make linux_armzip + cd .. + + - name: Build Linux + WinCross x64 if: (matrix.name == 'Linux-Wincross-x64') shell: bash run: |