bak

ForNetCode · Oct 4, 2023 · b02e501 · b02e501
1 parent d2fc0b8
commit b02e501
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 54 deletions.
diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
@@ -14,12 +14,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      #-
-      #  name: Set up QEMU
-      #  uses: docker/setup-qemu-action@v2
-      #  with:
-      #    platforms: arm64
-
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -38,7 +32,7 @@ jobs:
           #platforms: linux/amd64,linux/arm64
           push: true
           file: command/docker/client/client.Dockerfile
-          cache-from: type=gha
+          cache -from: type=gha
           cache-to: type=gha,mode=max
           tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}, ${{ env.REGISTRY }}/fornetcode/fornet:latest
   UnixCommandLine:
@@ -52,7 +46,10 @@ jobs:
             build: make release-linux
           - host: macos-latest
             target: x86_64-apple-darwin
-            build: make release-mac-x86_64            
+            build: make release-mac-x86_64
+          - host: macos-13-xlarge
+            target: aarch64-apple-darwin
+            build: make release-mac-aarch64           
           # - host: macos-latest # This needs aarch64 OpenSSL, will wait github action support MacOS M1(https://github.com/github/roadmap/issues/528), then run this.
           #   target: aarch64-apple-darwin
           #   build: make release-mac-aarch64
@@ -87,6 +84,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
+          name: fornet-${{ matrix.settings.target }}
           path: release/*
           if-no-files-found: error
   WindowsCommandLine:

diff --git a/.github/workflows/client_build_arm64.yml b/.github/workflows/client_build_arm64.yml
@@ -45,50 +45,5 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: fornet-linux-aarch64.tar.gz
-          path: release/fornet-linux-aarch64.tar.gz
-          if-no-files-found: error  
-
-  mac:
-    strategy:
-      max-parallel: 1
-      fail-fast: true
-      matrix:
-        settings:
-          - host: macos-13-xlarge
-            target: aarch64-apple-darwin
-            build: make release-mac-aarch64
-
-    runs-on: ${{ matrix.settings.host }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1        
-        with:
-          toolchain: stable
-          target: ${{ matrix.settings.target }}
-          profile: minimal
-      - name: Set up cargo cache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            client/target/            
-          key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
-      - name: Build
-        run: ${{ matrix.settings.build }}
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: fornet-macos-aarch64
-          path: release/*
+          path: release/fornet-aarch64-unknown-linux-gnu.tar.gz
           if-no-files-found: error