Skip to content

Commit

Permalink
Merge pull request #3345 from mulkieran/version-3.5.5
Browse files Browse the repository at this point in the history
Version 3.5.5
  • Loading branch information
mulkieran authored May 16, 2023
2 parents 6477898 + 1e7eb16 commit c78b6af
Show file tree
Hide file tree
Showing 34 changed files with 228 additions and 215 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
checks-with-ci-repo:
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- name: Install dependencies for Fedora
Expand All @@ -51,12 +51,12 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.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=stratisd_proc_macros --ignore-high=libblkid-rs --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=stratisd_proc_macros --ignore-high=libblkid-rs --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f36 IGNORE_ARGS="--ignore-category low --ignore-high=stratisd_proc_macros --ignore-high=libblkid-rs --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" 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" make -f Makefile_dependencies check-fedora-versions
COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f36 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions
24 changes: 12 additions & 12 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,37 +34,37 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # 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
Expand Down Expand Up @@ -95,11 +95,11 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # 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
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -74,17 +74,17 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
container:
image: ${{ matrix.image }}
options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
services:
tang:
# yamllint disable rule:line-length
image: ghcr.io/stratis-storage/stratisd/tang:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: ghcr.io/stratis-storage/stratisd/tang:38 # CURRENT DEVELOPMENT ENVIRONMENT
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
stratis-min-cli-checks:
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT 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
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run stratisd-min cli tests
run: make test-stratisd-min
- name: Run stratis-min cli tests
Expand All @@ -217,7 +217,7 @@ jobs:
shell-checks:
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- name: Install dependencies
Expand All @@ -238,7 +238,7 @@ jobs:
make -f Makefile_dependencies verify-dependency-bounds
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- name: Install dependencies for Fedora
Expand All @@ -260,7 +260,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
- name: Run ${{ matrix.task }}
Expand All @@ -269,7 +269,7 @@ jobs:
python-based-tests:
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev
steps:
- uses: actions/checkout@v3
Expand All @@ -295,7 +295,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
matrix:
include:
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
- toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
- toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -92,12 +92,12 @@ jobs:
python-based-checks_with_tang:
runs-on: ubuntu-22.04
container:
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
options: --privileged -v /dev:/dev --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 -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
services:
tang:
# yamllint disable rule:line-length
image: ghcr.io/stratis-storage/stratisd/tang:37 # CURRENT DEVELOPMENT ENVIRONMENT
image: ghcr.io/stratis-storage/stratisd/tang:38 # CURRENT DEVELOPMENT ENVIRONMENT
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
task: make -f Makefile yamllint
working-directory: .
runs-on: ubuntu-22.04
container: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
container: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v3
- name: Install dependencies
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
stratisd 3.5.5
==============
Recommended Rust toolchain version: 1.69.0
Lowest supported Rust toolchain version: 1.66.1


stratisd 3.5.4
==============
Recommended Rust toolchain version: 1.68.0
Expand Down
Loading

0 comments on commit c78b6af

Please sign in to comment.