Skip to content

Commit 080e111

Browse files
clippy fixes.
1 parent f74a88a commit 080e111

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ jobs:
4444
- os: ubuntu-latest
4545
target: x86_64-unknown-linux-gnu
4646
artifact_name: boxmux
47-
asset_name: boxmux-linux-amd64
47+
asset_name: boxmux-linux-x86_64
4848
- os: ubuntu-latest
4949
target: x86_64-unknown-linux-musl
5050
artifact_name: boxmux
51-
asset_name: boxmux-linux-musl-amd64
51+
asset_name: boxmux-linux-musl-x86_64
5252
- os: windows-latest
5353
target: x86_64-pc-windows-msvc
5454
artifact_name: boxmux.exe
55-
asset_name: boxmux-windows-amd64.exe
55+
asset_name: boxmux-windows-x86_64.exe
5656
- os: macos-latest
5757
target: x86_64-apple-darwin
5858
artifact_name: boxmux
59-
asset_name: boxmux-macos-amd64
59+
asset_name: boxmux-macos-x86_64
6060
- os: macos-latest
6161
target: aarch64-apple-darwin
6262
artifact_name: boxmux
@@ -68,6 +68,13 @@ jobs:
6868
uses: dtolnay/rust-toolchain@stable
6969
with:
7070
targets: ${{ matrix.target }}
71+
- name: Install Apple Silicon dependencies
72+
if: matrix.target == 'aarch64-apple-darwin'
73+
run: |
74+
# Update Xcode command line tools and set proper SDK
75+
sudo xcode-select --install || true
76+
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
77+
export MACOSX_DEPLOYMENT_TARGET=$(xcrun --sdk macosx --show-sdk-version)
7178
- name: Install musl-tools (Linux musl)
7279
if: matrix.target == 'x86_64-unknown-linux-musl'
7380
run: sudo apt-get update && sudo apt-get install -y musl-tools
@@ -143,19 +150,19 @@ jobs:
143150
run: |
144151
mkdir release-assets
145152
# Linux GNU
146-
cp boxmux-linux-amd64 release-assets/boxmux-linux-amd64 || echo "boxmux-linux-amd64 not found"
147-
chmod +x release-assets/boxmux-linux-amd64 2>/dev/null || true
153+
cp boxmux-linux-x86_64 release-assets/boxmux-linux-x86_64 || echo "boxmux-linux-x86_64 not found"
154+
chmod +x release-assets/boxmux-linux-x86_64 2>/dev/null || true
148155
# Linux musl
149-
cp boxmux-linux-musl-amd64 release-assets/boxmux-linux-musl-amd64 || echo "boxmux-linux-musl-amd64 not found"
150-
chmod +x release-assets/boxmux-linux-musl-amd64 2>/dev/null || true
156+
cp boxmux-linux-musl-x86_64 release-assets/boxmux-linux-musl-x86_64 || echo "boxmux-linux-musl-x86_64 not found"
157+
chmod +x release-assets/boxmux-linux-musl-x86_64 2>/dev/null || true
151158
# macOS Intel
152-
cp boxmux-macos-amd64 release-assets/boxmux-macos-amd64 || echo "boxmux-macos-amd64 not found"
153-
chmod +x release-assets/boxmux-macos-amd64 2>/dev/null || true
154-
# macOS ARM
159+
cp boxmux-macos-x86_64 release-assets/boxmux-macos-x86_64 || echo "boxmux-macos-x86_64 not found"
160+
chmod +x release-assets/boxmux-macos-x86_64 2>/dev/null || true
161+
# macOS Apple Silicon
155162
cp boxmux-macos-arm64 release-assets/boxmux-macos-arm64 || echo "boxmux-macos-arm64 not found"
156163
chmod +x release-assets/boxmux-macos-arm64 2>/dev/null || true
157164
# Windows
158-
cp boxmux-windows-amd64.exe release-assets/boxmux-windows-amd64.exe || echo "boxmux-windows-amd64.exe not found"
165+
cp boxmux-windows-x86_64.exe release-assets/boxmux-windows-x86_64.exe || echo "boxmux-windows-x86_64.exe not found"
159166
- name: Create checksums
160167
run: |
161168
cd release-assets
@@ -174,11 +181,11 @@ jobs:
174181
uses: softprops/action-gh-release@v2
175182
with:
176183
files: |
177-
release-assets/boxmux-linux-amd64
178-
release-assets/boxmux-linux-musl-amd64
179-
release-assets/boxmux-macos-amd64
184+
release-assets/boxmux-linux-x86_64
185+
release-assets/boxmux-linux-musl-x86_64
186+
release-assets/boxmux-macos-x86_64
180187
release-assets/boxmux-macos-arm64
181-
release-assets/boxmux-windows-amd64.exe
188+
release-assets/boxmux-windows-x86_64.exe
182189
release-assets/*.deb
183190
release-assets/*.rpm
184191
release-assets/checksums.txt

0 commit comments

Comments
 (0)