Merge pull request #71 from Nemo157/backout-ubuntu-packages

Backout PR #70
Nullus157 · Jul 5, 2024 · 0c47b0e · 0c47b0e
2 parents 23a50b7 + 9fcc238
commit 0c47b0e
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 125 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
diff --git a/.github/ubuntu-packages b/.github/ubuntu-packages
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -1,5 +1,2 @@
-[licenses]
-allow = [
-  "MIT",
-  "Apache-2.0",
-]
+[licenses.private]
+ignore = true