Skip to content

Commit

Permalink
Add support for installing additional packages on ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
Nemo157 committed Jul 5, 2024
1 parent a9602c2 commit 1e67f0e
Show file tree
Hide file tree
Showing 12 changed files with 112 additions and 13 deletions.
45 changes: 45 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
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
1 change: 1 addition & 0 deletions .github/ubuntu-packages
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libudev-dev
6 changes: 5 additions & 1 deletion .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
with:
toolchain: ${{ inputs.toolchain }}
rustflags: ${{ inputs.rustflags }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
- uses: taiki-e/install-action@v2
with:
tool: cargo-tarpaulin
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docsrs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ jobs:
name: cargo +nightly doc --cfg docsrs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: Nullus157/.github/.github/actions/setup@${{ env.GITHUB_WORKFLOW_SHA }}
with:
toolchain: nightly
rustflags: -Zallow-features=
update: ${{ inputs.update }}
- run: cargo doc --no-deps --workspace --all-features --locked
env:
RUSTDOCFLAGS: --cfg=docsrs -Dwarnings
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ jobs:
RUSTFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
- uses: taiki-e/install-action@v2
with:
tool: cargo-hack
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/minimal-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
with:
toolchain: ${{ inputs.toolchain }}
rustflags: ${{ inputs.rustflags }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/platforms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ jobs:
runs-on: ${{ matrix.platform.os }}
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
with:
target: ${{ matrix.platform.target }}
- run: sudo apt update && sudo apt install -y gcc-multilib
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
repository: Nullus157/.github
ref: ${{ github.workflow_sha }}
path: .nullus.github
- uses: ./.nullus.github/.github/actions/setup
with:
toolchain: ${{ inputs.toolchain }}
rustflags: ${{ inputs.rustflags }}
- run: cargo update
if: ${{ inputs.update }}
update: ${{ inputs.update }}
- run: cargo test --workspace --locked --all-features ${{ inputs.args }}

on:
Expand Down
25 changes: 25 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
name = "self-test"
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"
publish = false

[dependencies]
[target.x86_64-unknown-linux-gnu.dependencies]
libudev-sys = "0.1.4"
7 changes: 5 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[licenses.private]
ignore = true
[licenses]
allow = [
"MIT",
"Apache-2.0",
]

0 comments on commit 1e67f0e

Please sign in to comment.