Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 3.6.4 #3535

Merged
merged 26 commits into from
Jan 24, 2024
Merged

Version 3.6.4 #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f231357
Update to nix 0.27.1
jbaublitz Nov 13, 2023
4a47dcf
github actions: update FEDORA_RELEASE to F39, F38
bgurney-rh Nov 2, 2023
8f99964
Parameterize /usr/libexec everywhere
mulkieran Dec 4, 2023
f24b3e1
github actions: update recommended Rust to 1.74.1
bgurney-rh Dec 13, 2023
f3a3d58
Increase itertools dependency lower bound to 0.12.0
mulkieran Dec 27, 2023
c5f6b06
Replace get(0) with first()
bgurney-rh Jan 2, 2024
4607def
Remove unused imports
bgurney-rh Jan 2, 2024
76ffec2
Move initialize_devices import to cfg(test)
bgurney-rh Jan 2, 2024
da8bd6e
should_wake: replace get(0) with front()
bgurney-rh Jan 2, 2024
b4346d0
github actions: update recommended Rust to 1.75.0
bgurney-rh Jan 3, 2024
45d6027
Fix up prediction tests to match new filesystem interface
mulkieran Jan 3, 2024
9aed657
Start running clippy on stratis-dumpmetadata
mulkieran Jan 6, 2024
c6629d5
Remove unwrap() in stratis-dumpmetadata
mulkieran Jan 8, 2024
3b4cba6
Run thin_check in loud mode
mulkieran Jan 4, 2024
13279d5
Do not pass -q option to xfs.mkfs
mulkieran Jan 4, 2024
255f37f
Try both Clevis and passphrase in /etc/fstab setup
jbaublitz Jan 4, 2024
c6a27b1
Put dump-metadata code in separate file
mulkieran Jan 6, 2024
f8f6f67
Improve dispatch for tools in tools package
mulkieran Jan 6, 2024
da382db
Use loopdev-3 instead of loopdev crate
mulkieran Dec 20, 2023
8535262
Use checkout@v4
bgurney-rh Jan 17, 2024
f01a68d
Fix bug where unencrypted pools can't be started in stratisd-min
jbaublitz Jan 22, 2024
29f2f5f
Increase shlex version in Cargo.lock to 1.3.0
mulkieran Jan 22, 2024
37ee867
Fix for githooks
jbaublitz Jan 22, 2024
d1c2584
Increase pretty-hex dependency lower bound to 0.4.1
mulkieran Jan 16, 2024
5c8ff85
Makefile_dependencies: fix verify-dependency-bounds target
mulkieran Jan 24, 2024
3f70c64
version 3.6.4
mulkieran Jan 24, 2024
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
2 changes: 1 addition & 1 deletion .githooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export PROFILEDIR=debug

make fmt-ci &&
make build &&
make stratis-dumpmetadata &&
make stratisd-tools &&
make build-min &&
make build-no-ipc &&
make test &&
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
Expand All @@ -51,12 +51,12 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.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=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f39 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
30 changes: 15 additions & 15 deletions .github/workflows/fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,46 +40,46 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- task: PROFILEDIR=debug make -f Makefile stratisd-tools
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
Expand Down Expand Up @@ -107,14 +107,14 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand All @@ -99,7 +99,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
options: --privileged -p 80:80
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
# cracklib-dicts: https://github.com/stratis-storage/project/issues/581
run: >
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
image: fedora:34 # LOWEST DEVELOPMENT ENVIRONMENT
options: --privileged --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: >
dnf install -y
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged --userns=host --ipc=host -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: >
dnf install -y
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run stratisd-min cli tests
run: make test-stratisd-min
- name: Run stratis-min cli tests
Expand All @@ -228,7 +228,7 @@ jobs:
container:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: >
dnf install -y
Expand All @@ -244,7 +244,7 @@ jobs:
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Fedora
run: >
dnf install -y
Expand All @@ -267,7 +267,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand All @@ -287,7 +287,7 @@ jobs:
args: --log-level=debug stratisd_cert --verify-devices --monitor-dbus --highest-revision-number=6
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run apt-get update
run: sudo apt-get -q update
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
runs-on: ubuntu-22.04
container: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: >
dnf install -y
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,41 +40,41 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- task: PROFILEDIR=debug make -f Makefile stratisd-tools
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: ubuntu:jammy
options: --privileged -v /dev:/dev
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Ubuntu
run: apt-get -q update
- name: Install dependencies for Ubuntu
Expand Down Expand Up @@ -105,14 +105,14 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: ubuntu:jammy
options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Ubuntu
run: apt-get -q update
- name: Install dependencies for Ubuntu
Expand Down
33 changes: 33 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
stratisd 3.6.4
==============
Recommended Rust toolchain version: 1.75.0
Recommended development platform for Python development: Fedora 39

- Cherry-picked commits:
* Update to nix 0.27.1
* github actions: update FEDORA_RELEASE to F39, F38
* Parameterize /usr/libexec everywhere
* github actions: update recommended Rust to 1.74.1
* Increase itertools dependency lower bound to 0.12.0
* Replace get(0) with first()
* Remove unused imports
* Move initialize_devices import to cfg(test)
* should_wake: replace get(0) with front()
* github actions: update recommended Rust to 1.75.0
* Fix up prediction tests to match new filesystem interface
* Start running clippy on stratis-dumpmetadata
* Remove unwrap() in stratis-dumpmetadata
* Run thin_check in loud mode
* Do not pass -q option to xfs.mkfs
* Try both Clevis and passphrase in /etc/fstab setup
* Put dump-metadata code in separate file
* Improve dispatch for tools in tools package
* Use loopdev-3 instead of loopdev crate
* Use checkout@v4
* Fix bug where unencrypted pools can't be started in stratisd-min
* Increase shlex version in Cargo.lock to 1.3.0
* Fix for githooks
* Increase pretty-hex dependency lower bound to 0.4.1
* Makefile_dependencies: fix verify-dependency-bounds target


stratisd 3.6.3
==============
Recommended Rust toolchain version: 1.74.0
Expand Down
Loading