Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
dbus-devel
git
glibc-static
jq
libblkid-devel
make
python3-dbus-client-gen
Expand All @@ -116,27 +117,23 @@ jobs:
python3-psutil
python3-wcwidth
systemd-devel
toml-cli
- uses: stratis-storage/github-actions/github-modify@HEAD
with:
repo: stratisd
- name: Print head commit
run: git log --oneline -1
working-directory: stratisd
- name: Get package MSRV
id: msrv
run: |
MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version")
echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT"
working-directory: stratisd
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: cargo
toolchain: ${{ steps.msrv.outputs.MSRV }}
- name: Overwrite stratisd dependencies as necessary
uses: stratis-storage/github-actions/stratisd-modify@HEAD
with:
working-directory: stratisd
- name: Set toolchain to MSRV
uses: stratis-storage/github-actions/set-rust-toolchain@HEAD
with:
working-directory: stratisd
- name: Build stratisd
run: PROFILEDIR=debug make build-all-rust
working-directory: stratisd
Expand Down Expand Up @@ -175,6 +172,7 @@ jobs:
dbus-devel
git
glibc-static
jq
libblkid-devel
make
python3-coverage
Expand All @@ -186,27 +184,23 @@ jobs:
python3-psutil
python3-wcwidth
systemd-devel
toml-cli
- uses: stratis-storage/github-actions/github-modify@HEAD
with:
repo: stratisd
- name: Print head commit
run: git log --oneline -1
working-directory: stratisd
- name: Get package MSRV
id: msrv
run: |
MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version")
echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT"
working-directory: stratisd
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: cargo
toolchain: ${{ steps.msrv.outputs.MSRV }}
- name: Overwrite stratisd dependencies as necessary
uses: stratis-storage/github-actions/stratisd-modify@HEAD
with:
working-directory: stratisd
- name: Set toolchain to MSRV
uses: stratis-storage/github-actions/set-rust-toolchain@HEAD
with:
working-directory: stratisd
- name: Build stratisd
run: PROFILEDIR=debug make build-all-rust
working-directory: stratisd
Expand Down
Loading