Skip to content

Commit a598542

Browse files
committed
ci: support musl target
1 parent 2226f9d commit a598542

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

.github/actions/replace-version/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ runs:
1010
- name: Replace version
1111
shell: bash
1212
# There isn't a sed command working on all platforms to replace string in a file, so use perl.
13-
run: perl -i -pe's/0.0.0-staging/${{ inputs.version }}/' Cargo.toml
13+
run: perl -i -pe's/0.0.0-dev/${{ inputs.version }}/' Cargo.toml

.github/workflows/build-dev.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ jobs:
2323
# aarch64
2424
- { os: macos-11 , target: aarch64-apple-darwin , alias: aarch64-darwin-macos-11 }
2525
- { os: macos-12 , target: aarch64-apple-darwin , alias: aarch64-darwin-macos-12 }
26-
- { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu, alias: aarch64-gnu-ubuntu-20.04 }
27-
- { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu, alias: aarch64-gnu-ubuntu-22.04 }
2826
# amd64
2927
- { os: macos-12 , target: x86_64-apple-darwin , alias: amd64-darwin-macos-unknown }
3028
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-20.04 }
3129
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-22.04 }
30+
- { os: ubuntu-22.04, target: x86_64-unknown-linux-musl, alias: amd64-musl-linux-unknown }
3231
- { os: windows-2019, target: x86_64-pc-windows-msvc , alias: amd64-msvc-windows-2019 }
3332
- { os: windows-2022, target: x86_64-pc-windows-msvc , alias: amd64-msvc-windows-2022 }
3433

@@ -38,15 +37,15 @@ jobs:
3837
with:
3938
ref: ${{ github.event.pull_request.head.sha }}
4039

41-
- name: Setup rust toolchain
40+
- name: Setup Rust toolchain
4241
uses: actions-rs/toolchain@v1
4342
with:
4443
profile: minimal
4544
override: true
4645
toolchain: nightly-2023-09-06
4746
components: rustfmt, clippy
4847

49-
- name: Show rust toolchain version
48+
- name: Show Rust toolchain version
5049
shell: bash
5150
run: |
5251
cargo -V
@@ -55,16 +54,16 @@ jobs:
5554
rustc -V
5655
5756
- name: Setup musl-tools
58-
if: runner.os == 'Linux'
57+
if: matrix.targets.target == 'x86_64-unknown-linux-musl'
5958
shell: bash
60-
run: sudo apt install musl-tools
59+
run: sudo apt -y install musl-tools
6160

6261
- name: Add target
6362
uses: ./.github/actions/add-target
6463
with:
6564
target: ${{ matrix.targets.target }}
6665

67-
- name: Setup rust cache
66+
- name: Setup Rust cache
6867
uses: Swatinem/rust-cache@v2
6968
with:
7069
prefix-key: ${{ matrix.targets.alias }}

.github/workflows/build-release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ jobs:
1717
# aarch64
1818
- { os: macos-11 , target: aarch64-apple-darwin , alias: aarch64-darwin-macos-11 }
1919
- { os: macos-12 , target: aarch64-apple-darwin , alias: aarch64-darwin-macos-12 }
20-
- { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu, alias: aarch64-gnu-ubuntu-20.04 }
21-
- { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu, alias: aarch64-gnu-ubuntu-22.04 }
2220
# amd64
2321
- { os: macos-12 , target: x86_64-apple-darwin , alias: amd64-darwin-macos-unknown }
2422
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-20.04 }
2523
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-22.04 }
24+
- { os: ubuntu-22.04, target: x86_64-unknown-linux-musl, alias: amd64-musl-linux-unknown }
2625
- { os: windows-2019, target: x86_64-pc-windows-msvc , alias: amd64-msvc-windows-2019 }
2726
- { os: windows-2022, target: x86_64-pc-windows-msvc , alias: amd64-msvc-windows-2022 }
2827

@@ -32,7 +31,7 @@ jobs:
3231
with:
3332
ref: ${{ github.event.pull_request.head.sha }}
3433

35-
- name: Setup rust toolchain
34+
- name: Setup Rust toolchain
3635
uses: actions-rs/toolchain@v1
3736
with:
3837
profile: minimal
@@ -41,16 +40,16 @@ jobs:
4140
components: rustfmt, clippy
4241

4342
- name: Setup musl-tools
44-
if: runner.os == 'Linux'
43+
if: matrix.targets.target == 'x86_64-unknown-linux-musl'
4544
shell: bash
46-
run: sudo apt install musl-tools
45+
run: sudo apt -y install musl-tools
4746

4847
- name: Add target
4948
uses: ./.github/actions/add-target
5049
with:
5150
target: ${{ matrix.targets.target }}
5251

53-
- name: Setup rust cache
52+
- name: Setup Rust cache
5453
uses: Swatinem/rust-cache@v2
5554
with:
5655
prefix-key: ${{ matrix.targets.alias }}

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "cnb"
33
# WRN: Version will be updated by CI while create a tag, NERVER change this.
4-
version = "0.0.0-staging"
4+
version = "0.0.0-dev"
55
edition = "2021"
66
description = "Cnblogs' command line tool"
77
license = "MIT"

0 commit comments

Comments
 (0)