diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml deleted file mode 100644 index 07eb912..0000000 --- a/.github/actions/setup/action.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: setup build environment - -inputs: - toolchain: - default: stable - type: string - rustflags: - required: false - type: string - target: - required: false - type: string - components: - required: false - type: string - update: - default: false - type: boolean - -runs: - using: composite - steps: - - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: ${{ inputs.toolchain }} - rustflags: ${{ inputs.rustflags }} - target: ${{ inputs.target }} - components: ${{ inputs.components }} - - shell: bash - if: ${{ runner.os == 'Linux' }} - run: | - if [ -f .github/ubuntu-packages ]; then - readarray -t packages <.github/ubuntu-packages - echo "Installing packages:" "${packages[@]}" - sudo apt-get install "${packages[@]}" - fi - - shell: bash - if: ${{ inputs.update }} - run: cargo update diff --git a/.github/ubuntu-packages b/.github/ubuntu-packages deleted file mode 100644 index f60b8db..0000000 --- a/.github/ubuntu-packages +++ /dev/null @@ -1 +0,0 @@ -libudev-dev diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 07164e3..183074f 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -4,11 +4,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ inputs.toolchain }} rustflags: ${{ inputs.rustflags }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 62b8e69..04acdf7 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -6,11 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: taiki-e/install-action@v2 with: tool: cargo-tarpaulin diff --git a/.github/workflows/docsrs.yml b/.github/workflows/docsrs.yml index 23e9f42..8a3454d 100644 --- a/.github/workflows/docsrs.yml +++ b/.github/workflows/docsrs.yml @@ -4,15 +4,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly rustflags: -Zallow-features= - update: ${{ inputs.update }} - run: cargo doc --no-deps --workspace --all-features --locked env: RUSTDOCFLAGS: --cfg=docsrs -Dwarnings diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml index 85e137b..1fad885 100644 --- a/.github/workflows/features.yml +++ b/.github/workflows/features.yml @@ -6,11 +6,7 @@ jobs: RUSTFLAGS: -Dwarnings steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: taiki-e/install-action@v2 with: tool: cargo-hack diff --git a/.github/workflows/minimal-versions.yml b/.github/workflows/minimal-versions.yml index 987bde3..e76e771 100644 --- a/.github/workflows/minimal-versions.yml +++ b/.github/workflows/minimal-versions.yml @@ -4,11 +4,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ inputs.toolchain }} rustflags: ${{ inputs.rustflags }} diff --git a/.github/workflows/platforms.yml b/.github/workflows/platforms.yml index 7981064..0ad21a6 100644 --- a/.github/workflows/platforms.yml +++ b/.github/workflows/platforms.yml @@ -12,11 +12,7 @@ jobs: runs-on: ${{ matrix.platform.os }} steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: target: ${{ matrix.platform.target }} - run: sudo apt update && sudo apt install -y gcc-multilib diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf1f8d7..5a5b9f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,15 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: Nullus157/.github - ref: ${{ github.workflow_sha }} - path: .nullus.github - - uses: ./.nullus.github/.github/actions/setup + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ inputs.toolchain }} rustflags: ${{ inputs.rustflags }} - update: ${{ inputs.update }} + - run: cargo update + if: ${{ inputs.update }} - run: cargo test --workspace --locked --all-features ${{ inputs.args }} on: diff --git a/Cargo.lock b/Cargo.lock index ce4dbff..39b2027 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,33 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - [[package]] name = "self-test" version = "0.1.0" -dependencies = [ - "libc", - "libudev-sys", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index 0ab3015..d9cd99e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,15 +2,6 @@ name = "self-test" version = "0.1.0" edition = "2021" -license = "MIT OR Apache-2.0" publish = false -[target.x86_64-unknown-linux-gnu.dependencies] -libudev-sys = "0.1.4" - -# fix minimal-versions -[target.'cfg(any())'.dependencies] -libc = "0.2.155" - -[target.'cfg(any())'.build-dependencies] -pkg-config = "0.3.30" +[dependencies] diff --git a/deny.toml b/deny.toml index 8866d13..6d1af09 100644 --- a/deny.toml +++ b/deny.toml @@ -1,5 +1,2 @@ -[licenses] -allow = [ - "MIT", - "Apache-2.0", -] +[licenses.private] +ignore = true