Merge pull request #23 from Miaxos/feat-ci-macos-arm

test: ci apple macos runners
Miaxos · Feb 2, 2024 · e006154 · e006154
2 parents 24f7590 + 9fb0a34
commit e006154
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get the release version from the tag
         if: env.VERSION == ''
-        run: echo "${{ github.ref_name }}" | sed -En 's/^roster-v(.*)$/VERSION=\1/p' >> $GITHUB_ENV
+        run: echo "${{ github.ref_name }}" | sed -En 's/^v(.*)$/VERSION=\1/p' >> $GITHUB_ENV
       - name: Get the roster release version from the tag
         if: env.RELEASE_NAME == ''
         run: echo "RELEASE_NAME=${{ github.ref_name }}" >> $GITHUB_ENV
@@ -30,7 +30,7 @@ jobs:
       - name: Check that tag version and Cargo.toml version are the same
         shell: bash
         run: |
-          if ! grep -q "version = \"$VERSION\"" cli/Cargo.toml; then
+          if ! grep -q "version = \"$VERSION\"" Cargo.toml; then
             echo "version does not match Cargo.toml" >&2
             exit 1
           fi
@@ -104,6 +104,10 @@ jobs:
           os: macos-latest
           rust: nightly
           target: x86_64-apple-darwin
+        - build: macos
+          os: macos-latest
+          rust: nightly
+          target: aarch64-apple-darwin
 #       - build: win-msvc
 #         os: windows-latest
 #         rust: nightly
@@ -205,8 +209,8 @@ jobs:
       run: |
         mkdir -p "$ARCHIVE"/{complete,doc}
         cp "$BIN" "$ARCHIVE"/
-        cp cli/README.md "$ARCHIVE"/
-        cp cli/CHANGELOG.md "$ARCHIVE"/doc/
+        cp README.md "$ARCHIVE"/
+        cp CHANGELOG.md "$ARCHIVE"/doc/
 
 #   - name: Generate man page and completions (no emulation)
 #     if: matrix.qemu == ''

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,6 +76,11 @@ jobs:
         - build: macos
           os: macos-latest
           rust: nightly
+          target: x86_64-apple-darwin
+        - build: macos
+          os: macos-latest
+          rust: nightly
+          target: aarch64-apple-darwin
 #       - build: win-msvc
 #         os: windows-2022
 #         rust: nightly