Skip to content

Commit 0060e1c

Browse files
Ecordonniercakebaker
authored andcommitted
remove feat_os_unix_musl
After the addition of utmpx, feat_os_unix_musl is now identical to feat_os_unix and is thus not needed any more. Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
1 parent af33a0d commit 0060e1c

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.github/workflows/CICD.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,13 @@ jobs:
516516
# - { os , target , cargo-options , features , use-cross , toolchain, skip-tests, workspace-tests }
517517
- { os: ubuntu-latest , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross , skip-tests: true }
518518
- { os: ubuntu-24.04-arm , target: aarch64-unknown-linux-gnu , features: feat_os_unix_gnueabihf }
519-
- { os: ubuntu-latest , target: aarch64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
519+
- { os: ubuntu-latest , target: aarch64-unknown-linux-musl , features: feat_os_unix , use-cross: use-cross , skip-tests: true }
520520
# - { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: feat_selinux , use-cross: use-cross }
521521
- { os: ubuntu-latest , target: i686-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
522-
- { os: ubuntu-latest , target: i686-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
522+
- { os: ubuntu-latest , target: i686-unknown-linux-musl , features: feat_os_unix , use-cross: use-cross }
523523
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
524524
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
525-
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
525+
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix , use-cross: use-cross }
526526
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
527527
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
528528
- { os: macos-13 , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }

Cargo.toml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ feat_os_macos = [
149149
#
150150
"feat_require_unix_hostid",
151151
]
152-
# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms
152+
# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms.
153+
# Also used for targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)
153154
feat_os_unix = [
154155
"feat_Tier1",
155156
#
@@ -171,15 +172,6 @@ feat_os_unix_gnueabihf = [
171172
"feat_require_unix_hostid",
172173
"feat_require_unix_utmpx",
173174
]
174-
# "feat_os_unix_musl" == set of utilities which can be built/run on targets binding to the "musl" library (ref: <https://musl.libc.org/about.html>)
175-
feat_os_unix_musl = [
176-
"feat_Tier1",
177-
#
178-
"feat_require_crate_cpp",
179-
"feat_require_unix",
180-
"feat_require_unix_hostid",
181-
"feat_require_unix_utmpx",
182-
]
183175
feat_os_unix_android = [
184176
"feat_Tier1",
185177
#

0 commit comments

Comments
 (0)