Skip to content

Commit d661c08

Browse files
Bluemangoosylvestre
authored andcommitted
uptime: move some codes to uucore
1 parent 249b57a commit d661c08

File tree

9 files changed

+368
-303
lines changed

9 files changed

+368
-303
lines changed

.github/workflows/CICD.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,10 @@ jobs:
264264
- uses: actions/checkout@v4
265265
with:
266266
persist-credentials: false
267+
- if: ${{ contains(matrix.os, 'ubuntu') }}
268+
run: |
269+
sudo apt-get update -y
270+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
267271
- uses: dtolnay/rust-toolchain@stable
268272
- uses: taiki-e/install-action@nextest
269273
- uses: Swatinem/rust-cache@v2
@@ -320,6 +324,10 @@ jobs:
320324
- uses: actions/checkout@v4
321325
with:
322326
persist-credentials: false
327+
- if: ${{ contains(matrix.os, 'ubuntu') }}
328+
run: |
329+
sudo apt-get update -y
330+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
323331
- uses: dtolnay/rust-toolchain@stable
324332
- uses: taiki-e/install-action@nextest
325333
- uses: Swatinem/rust-cache@v2
@@ -349,6 +357,10 @@ jobs:
349357
- uses: actions/checkout@v4
350358
with:
351359
persist-credentials: false
360+
- if: ${{ contains(matrix.os, 'ubuntu') }}
361+
run: |
362+
sudo apt-get update -y
363+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
352364
- uses: dtolnay/rust-toolchain@nightly
353365
- uses: taiki-e/install-action@nextest
354366
- uses: Swatinem/rust-cache@v2
@@ -384,7 +396,7 @@ jobs:
384396
run: |
385397
## Install dependencies
386398
sudo apt-get update
387-
sudo apt-get install jq
399+
sudo apt-get install jq libsystemd-dev
388400
- name: "`make install`"
389401
shell: bash
390402
run: |
@@ -507,6 +519,10 @@ jobs:
507519
- uses: actions/checkout@v4
508520
with:
509521
persist-credentials: false
522+
- if: ${{ contains(matrix.os, 'ubuntu') }}
523+
run: |
524+
sudo apt-get update -y
525+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
510526
- uses: dtolnay/rust-toolchain@master
511527
with:
512528
toolchain: ${{ env.RUST_MIN_SRV }}
@@ -987,6 +1003,10 @@ jobs:
9871003
- uses: actions/checkout@v4
9881004
with:
9891005
persist-credentials: false
1006+
- if: ${{ contains(matrix.os, 'ubuntu') }}
1007+
run: |
1008+
sudo apt-get update -y
1009+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
9901010
- uses: dtolnay/rust-toolchain@stable
9911011
- uses: Swatinem/rust-cache@v2
9921012
- name: build and test all features individually

.github/workflows/GnuTests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ jobs:
6161
TEST_SUMMARY_FILE='gnu-result.json'
6262
TEST_FULL_SUMMARY_FILE='gnu-full-result.json'
6363
outputs SUITE_LOG_FILE ROOT_SUITE_LOG_FILE TEST_FILESET_PREFIX TEST_FILESET_SUFFIX TEST_LOGS_GLOB TEST_SUMMARY_FILE TEST_FULL_SUMMARY_FILE
64+
- name: Install deps
65+
run: |
66+
sudo apt-get update -y
67+
sudo apt-get -yq --no-install-suggests --no-install-recommends install libsystemd-dev
6468
- name: Checkout code (uutil)
6569
uses: actions/checkout@v4
6670
with:

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uu/uptime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ path = "src/uptime.rs"
1919
[dependencies]
2020
chrono = { workspace = true }
2121
clap = { workspace = true }
22-
uucore = { workspace = true, features = ["libc", "utmpx"] }
22+
uucore = { workspace = true, features = ["libc", "utmpx", "uptime"] }
2323
thiserror = { workspace = true }
2424

2525
[target.'cfg(target_os="linux")'.dependencies]

0 commit comments

Comments
 (0)