Skip to content

Commit

Permalink
Merge pull request #10 from mulkieran/version-0.5.1
Browse files Browse the repository at this point in the history
version 0.5.1
  • Loading branch information
mulkieran authored Mar 4, 2024
2 parents 924826c + 29e0eaa commit f05502a
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 5 deletions.
53 changes: 49 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
on: [push, pull_request]
---
name: loopdev-3 ci

name: loopdev
# yamllint disable-line rule:truthy
on:
push:
pull_request:

jobs:
check:
Expand All @@ -16,7 +20,7 @@ jobs:
- x86_64-unknown-linux-musl
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand All @@ -26,6 +30,7 @@ jobs:
target: ${{ matrix.target }}
override: true
- name: Cross
# yamllint disable rule:line-length
run: cargo install --git https://github.com/cross-rs/cross.git --rev bb3df1b cross

- name: Run cargo check
Expand All @@ -40,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand All @@ -61,3 +66,43 @@ jobs:

- name: Run cargo clippy
run: make -f Makefile clippy

dependencies:
runs-on: ubuntu-latest
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
curl
git
make
openssl-devel
python-requests
python-semantic_version
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
- name: Run comparisons of version specs with available Fedora packages
# yamllint disable rule:line-length
run: |
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f39 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
working-directory: ./ci/dependency_management

yamllint:
runs-on: ubuntu-20.04
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: dnf install -y make yamllint
- name: Run yamllint
run: make -f Makefile yamllint
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ disk.img
*.rustfmt
.vagrant
*.log
*.swp
*.swo
10 changes: 10 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
loopdev-3 0.5.1
===============
Recommended Rust toolchain version: 1.76.0
Recommended development platform for Python development: Fedora 38

- Increase bindgen dependency lower bound to 0.69.0:
https://github.com/stratis-storage/loopdev-3/pull/9

- Tidies and Maintenance:
https://github.com/stratis-storage/loopdev-3/pull/8
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "loopdev-3"
description = "Setup and control loop devices"
version = "0.5.0"
version = "0.5.1"
authors = ["Stratis Developers <[email protected]>", "Michael Daffin <[email protected]>"]
license = "MIT"
documentation = "https://docs.rs/loopdev-3"
Expand Down
32 changes: 32 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
ifeq ($(origin FEDORA_RELEASE), undefined)
else
FEDORA_RELEASE_ARGS = --release=${FEDORA_RELEASE}
endif

ifeq ($(origin MANIFEST_PATH), undefined)
else
MANIFEST_PATH_ARGS = --manifest-path=${MANIFEST_PATH}
endif

ifeq ($(origin CLIPPY_FIX), undefined)
CLIPPY_OPTS = --all-targets --no-deps
else
Expand All @@ -10,3 +20,25 @@ CLIPPY_DENY = -D clippy::all -D clippy::cargo -A clippy::multiple-crate-versions

clippy:
RUSTFLAGS="${DENY}" cargo clippy ${CLIPPY_OPTS} -- ${CLIPPY_DENY}

COMPARE_FEDORA_VERSIONS ?=
test-compare-fedora-versions:
echo "Testing that COMPARE_FEDORA_VERSIONS environment variable is set to a valid path"
test -e "${COMPARE_FEDORA_VERSIONS}"

check-fedora-versions: test-compare-fedora-versions
${COMPARE_FEDORA_VERSIONS} ${MANIFEST_PATH_ARGS} ${FEDORA_RELEASE_ARGS} ${IGNORE_ARGS}

yamllint:
yamllint --strict .github/workflows/*.yml

audit:
cargo audit -D warnings


.PHONY:
audit
check-fedora-versions
clippy
test-compare-fedora-versions
yamllint

0 comments on commit f05502a

Please sign in to comment.