Skip to content

Commit 368229c

Browse files
authored
Merge pull request #19 from fpco/logs
fix: Remove unnecessary non-PID 1 log output
2 parents 92c4f64 + ed0443e commit 368229c

File tree

12 files changed

+143
-146
lines changed

12 files changed

+143
-146
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Release
22

33
on:
4+
pull_request:
45
push:
56
tags:
67
- '*' # Push events to matching v*, i.e. v1.0, v20.15.10
@@ -15,22 +16,19 @@ env:
1516
jobs:
1617
checks:
1718
runs-on: ${{ matrix.os }}
18-
1919
strategy:
2020
fail-fast: false
2121
matrix:
2222
os:
2323
- ubuntu-latest
24-
2524
toolchain:
26-
- 1.82.0
25+
- 1.88.0
2726

2827
steps:
29-
- uses: actions/checkout@v2
30-
- uses: extractions/setup-just@v1
28+
- uses: actions/checkout@v4
29+
- uses: taiki-e/install-action@v2
3130
with:
32-
just-version: 1.10.0
33-
- uses: cargo-bins/cargo-binstall@main
31+
tool: just@1.40.0,cross@0.2.5
3432
- uses: Swatinem/rust-cache@v2
3533
with:
3634
key: ${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-${{ matrix.toolchain }}
@@ -41,19 +39,18 @@ jobs:
4139
run: |
4240
sudo apt-get install -y musl-tools
4341
rustup target add x86_64-unknown-linux-musl
44-
cargo binstall cross --no-confirm
4542
- name: Build Musl binary
4643
run: just build-release-binary
4744
- name: Build other binaries
4845
run: just binaries true
4946
- name: Generate artifacts
5047
run: just cp-binaries
51-
- uses: actions/upload-artifact@v3
48+
- uses: actions/upload-artifact@v4
5249
with:
5350
name: binaries
5451
path: artifacts/*
5552
- name: Release
56-
uses: softprops/action-gh-release@v1
53+
uses: softprops/action-gh-release@v2
5754
if: startsWith(github.ref, 'refs/tags/')
5855
with:
5956
files: artifacts/*

.github/workflows/rust.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,22 @@ jobs:
2525
- ubuntu-latest
2626
- macos-latest
2727
- windows-latest
28-
2928
toolchain:
30-
- 1.82.0
29+
- 1.88.0
3130
- stable
3231
- nightly
33-
3432
steps:
35-
- uses: actions/checkout@v2
36-
- uses: extractions/setup-just@v1
37-
with:
38-
just-version: 1.10.0
39-
- uses: Swatinem/rust-cache@v2
33+
- uses: actions/checkout@v4
34+
- uses: taiki-e/install-action@v2
4035
with:
41-
key: ${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-${{ matrix.toolchain }}
36+
tool: just@1.40.0
4237
- uses: dtolnay/rust-toolchain@master
4338
with:
4439
toolchain: ${{ matrix.toolchain }}
4540
components: clippy, rustfmt
41+
- uses: Swatinem/rust-cache@v2
42+
with:
43+
key: ${{ runner.os }}-${{ hashFiles('Cargo.lock') }}-${{ matrix.toolchain }}
4644
- name: Install musl tools
4745
run: |
4846
sudo apt-get install -y musl-tools
@@ -58,7 +56,6 @@ jobs:
5856
- name: Run pid1 tests
5957
run: just test-init-image
6058
if: runner.os == 'Linux'
61-
- name: clippy
62-
run: cargo clippy -- --deny "warnings"
63-
- name: fmt
64-
run: cargo fmt -- --check
59+
- name: Lint
60+
run: just lint
61+
if: matrix.toolchain == '1.88.0'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/target
22
/etc/simple
3+
.env
4+
.envrc

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# v0.1.5
2+
3+
- Bump versions.
4+
- Remove confusing non PID 1 log message.
5+
16
# v0.1.4
27

38
- Add integration testing

0 commit comments

Comments
 (0)