Update and rename buildrelease.yml to build_utils.yml, added linux aarch64 build, switched to universal2 macos target

2025-04-19 23:32:55 -05:00 · 2024-07-17 00:01:53 -05:00
3 changed files with 7 additions and 132 deletions
--- a/.github/workflows/build_pak_explorer.yml
+++ b/.github/workflows/build_pak_explorer.yml
@ -1,114 +0,0 @@
-name: Publish PAK Explorer on release
-
-on:
-  push:
-    tags: [ 'explorer-*.*.*' ]
-
-env:
-    BINARIES: "--bin pak_explorer"
-
-permissions:
-  contents: write
-
-jobs:
-    build:
-        name: Build binaries for Windows and Linux
-        runs-on: ubuntu-latest
-        steps:
-        - name: '📄 Checkout'
-          uses: actions/checkout@v4
-
-        - name: '⚙️ Set up Rust environment'
-          uses: dtolnay/rust-toolchain@master
-          with:
-              toolchain: stable
-              targets: x86_64-pc-windows-gnu, i686-pc-windows-gnu, x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu
-
-        - name: '🔽 Cache Rust dependencies'
-          uses: actions/cache@v4
-          with:
-              path: target
-              key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
-              restore-keys: |
-                  ${{ runner.OS }}-build-
-
-        - name: '🔄 Set up additional requirements'
-          run: |
-            sudo apt-get install -y gcc-mingw-w64
-            pip install cargo-zigbuild
-
-        - name: '📦 Package Windows x86_64'
-          run: |
-              cd ${{github.workspace}}
-              cargo build --profile production --target x86_64-pc-windows-gnu $BINARIES
-              cp target/x86_64-pc-windows-gnu/production/pak_explorer.exe PAK-Explorer_Windows-x86_64.exe
-              gh release upload ${{ github.ref_name }} PAK-Explorer_Windows-x86_64.exe
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
-
-        - name: '📦 Package Windows i686'
-          run: |
-              cd ${{github.workspace}}
-              cargo build --profile production --target i686-pc-windows-gnu $BINARIES
-              cp target/i686-pc-windows-gnu/production/pak_explorer.exe PAK-Explorer_Windows-x86.exe
-              gh release upload ${{ github.ref_name }} PAK-Explorer_Windows-x86.exe
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
-
-        - name: '📦 Package Linux x86_64'
-          run: |
-              cd ${{github.workspace}}
-              cargo build --profile production --target x86_64-unknown-linux-gnu $BINARIES
-              cp target/x86_64-unknown-linux-gnu/production/pak_explorer PAK-Explorer_Linux-x86_64
-              gh release upload ${{ github.ref_name }} PAK-Explorer_Linux-x86_64
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
-
-        - name: '📦 Package Linux aarch64'
-          run: |
-              cd ${{github.workspace}}
-              cargo zigbuild --profile production --target aarch64-unknown-linux-gnu $BINARIES
-              cp target/aarch64-unknown-linux-gnu/production/pak_explorer PAK-Explorer_Linux-Arm64
-              gh release upload ${{ github.ref_name }} PAK-Explorer_Linux-Arm64
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
-
-    build-mac:
-        name: Build binaries for MacOS
-        runs-on: macos-14
-        steps:
-        - name: '📄 Checkout'
-          uses: actions/checkout@v4
-
-        - name: '⚙️ Set up Rust environment'
-          uses: dtolnay/rust-toolchain@master
-          with:
-              toolchain: stable
-              targets: x86_64-apple-darwin, aarch64-apple-darwin
-
-        - name: '🔽 Cache Rust dependencies'
-          uses: actions/cache@v4
-          with:
-              path: target
-              key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
-              restore-keys: |
-                  ${{ runner.OS }}-build-
-
-        - name: '🔄 Set up additional requirements'
-          run: |
-            brew install zig
-            cargo install --locked cargo-zigbuild
-
-        - name: '📦 Package MacOS Universal2'
-          run: |
-              cd ${{github.workspace}}
-              cargo zigbuild --manifest-path "pak_explorer/Cargo.toml" --profile production --target universal2-apple-darwin $BINARIES
-              cp target/universal2-apple-darwin/production/pak_explorer PAK-Explorer_Mac-Universal
-              gh release upload ${{ github.ref_name }} PAK-Explorer_Mac-Universal
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
--- a/.github/workflows/build_utils.yml
+++ b/.github/workflows/build_utils.yml
@ -22,7 +22,7 @@ jobs:
          uses: dtolnay/rust-toolchain@master
          with:
              toolchain: stable
-              targets: x86_64-pc-windows-gnu, i686-pc-windows-gnu, x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu
+              targets: x86_64-pc-windows-gnu, x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu

        - name: '🔽 Cache Rust dependencies'
          uses: actions/cache@v4
@ -47,16 +47,6 @@ jobs:
              GITHUB_TOKEN: ${{ github.TOKEN }}
          shell: bash

-        - name: '📦 Package Windows i686'
-          run: |
-              cd ${{github.workspace}}
-              cargo build --profile production --target i686-pc-windows-gnu $BINARIES
-              zip -j lbee-utils_Windows-x86.zip target/i686-pc-windows-gnu/production/czutil.exe target/i686-pc-windows-gnu/production/pakutil.exe
-              gh release upload ${{ github.ref_name }} lbee-utils_Windows-x86.zip
-          env:
-              GITHUB_TOKEN: ${{ github.TOKEN }}
-          shell: bash
-
        - name: '📦 Package Linux x86_64'
          run: |
              cd ${{github.workspace}}
@ -67,12 +57,12 @@ jobs:
              GITHUB_TOKEN: ${{ github.TOKEN }}
          shell: bash

-        - name: '📦 Package Linux aarch64'
+        - name: '📦 Package Linux Arm'
          run: |
              cd ${{github.workspace}}
              cargo zigbuild --profile production --target aarch64-unknown-linux-gnu $BINARIES
-              zip -j lbee-utils_Linux-Arm64.zip target/aarch64-unknown-linux-gnu/production/czutil target/aarch64-unknown-linux-gnu/production/pakutil
-              gh release upload ${{ github.ref_name }} lbee-utils_Linux-Arm64.zip
+              zip -j lbee-utils_Linux-Arm.zip target/aarch64-unknown-linux-gnu/production/czutil target/aarch64-unknown-linux-gnu/production/pakutil
+              gh release upload ${{ github.ref_name }} lbee-utils_Linux-Arm.zip
          env:
              GITHUB_TOKEN: ${{ github.TOKEN }}
          shell: bash
@ -100,13 +90,12 @@ jobs:

        - name: '🔄 Set up additional requirements'
          run: |
-            brew install zig
-            cargo install --locked cargo-zigbuild
+            pip install cargo-zigbuild

        - name: '📦 Package MacOS Universal2'
          run: |
              cd ${{github.workspace}}
-              cargo zigbuild --manifest-path "utils/Cargo.toml" --profile production --target universal2-apple-darwin $BINARIES
+              cargo zigbuild --profile production --target universal2-apple-darwin $BINARIES
              zip -j lbee-utils_Mac-Universal.zip target/universal2-apple-darwin/production/czutil target/universal2-apple-darwin/production/pakutil
              gh release upload ${{ github.ref_name }} lbee-utils_Mac-Universal.zip
          env:
--- a/pak_explorer/Cargo.toml
+++ b/pak_explorer/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "pak_explorer"
 edition = "2021"
-version = "0.1.2"
+version = "0.1.1"
 description = """
 A simple GUI for exploring and making modifications to LUCA System PAK files.
 """