update

tamada · Apr 17, 2024 · e718d89 · e718d89
1 parent c06d6a2
commit e718d89
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -36,32 +36,33 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: setup
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
+            target: x86_64-unknown-linux-musl
             artifact_name: ${{ needs.setup.outputs.appname }}
             asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_linux_amd64
           - os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
+            target: aarch64-unknown-linux-musl
             artifact_name: ${{ needs.setup.outputs.appname }}
             asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_linux_arm64
-          - os: ubuntu-latest
+          - os: macOS-latest
             target: x86_64-apple-darwin
             artifact_name: ${{ needs.setup.outputs.appname }}
             asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_darwin_amd64
-          - os: ubuntu-latest
+          - os: macOS-latest
             target: aarch64-apple-darwin
             artifact_name: ${{ needs.setup.outputs.appname }}
             asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_darwin_arm64
-        #   - os: ubuntu-latest
-        #     target: x86_64-pc-windows-msvc
-        #     artifact_name: ${{ needs.setup.outputs.appname }}.exe
-        #     asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_windows_amd64
-        #   - os: ubuntu-latest
-        #     target: aarch64-pc-windows-msvc
-        #     artifact_name: btmeister.exe
-        #     asset_name: btmeister-${{ needs.setup.outputs.tag }}_windows_arm64
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+            artifact_name: ${{ needs.setup.outputs.appname }}.exe
+            asset_name: ${{ needs.setup.outputs.appname }}-${{ needs.setup.outputs.tag }}_windows_amd64
+          - os: windows-latest
+            target: aarch64-pc-windows-msvc
+            artifact_name: btmeister.exe
+            asset_name: btmeister-${{ needs.setup.outputs.tag }}_windows_arm64
 
     steps:
       # initialization
@@ -70,13 +71,24 @@ jobs:
         with:
           ref: main
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
-
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}        
+
       - name: Setup Rust (1/2)
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Setup Rust (2/2)
         run: |
-          cargo install cross
+          cargo bininstall --no-confirm cross
+
+      - uses: mbround18/setup-osxcross@v1
+        # This builds executables & sets env variables for rust to consume.
+        with:
+          osx-version: "12.3"
 
       - name: Setup variables
         id: vars
@@ -87,7 +99,8 @@ jobs:
         
       - name: Cross build with all features
         run: |
-          cross build --release --target ${{ matrix.target }}
+          rustup target add ${{ matrix.target }}
+          cargo build --release --target ${{ matrix.target }}
                   
       # publish release
       - name: Create release file

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "totebag"
-version = "0.1.7"
+version = "0.1.8"
 description = "A tool for archiving files and directories and extracting several archive formats."
 repository = "https://github.com/tamada/totebag"
 readme = "README.md"