Merge pull request #3487 from mulkieran/patch-3.6.0-setup

Patch 3.6.0 setup
stratis-storage · Oct 31, 2023 · a15210e · a15210e
2 parents 66e2632 + 313ddd9
commit a15210e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 724 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -5,13 +5,13 @@ name: stratisd cargo CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - '**/Cargo.toml'
       - '.github/workflows/cargo.yml'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - '**/Cargo.toml'
       - '.github/workflows/cargo.yml'

diff --git a/.github/workflows/dummy.yml b/.github/workflows/dummy.yml
@@ -5,10 +5,10 @@ name: stratisd dummy CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
 
   workflow_dispatch:
 

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -5,7 +5,7 @@ name: stratisd CI on fedora
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -16,7 +16,7 @@ on:
       - 'test/**'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ name: stratisd CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -16,7 +16,7 @@ on:
       - 'test/**'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -170,6 +170,9 @@ jobs:
         run: cp stratisd.conf /usr/share/dbus-1/system.d
       - name: Check out stratis-cli
         run: git clone https://github.com/stratis-storage/stratis-cli.git
+      - name: Use stratis-cli 3.6.0
+        run: git checkout tags/v3.6.0 -b version-3.6.0
+        working-directory: ./stratis-cli
       - name: Run stratis-cli tests
         run: >
           RUST_LOG=stratisd=debug
@@ -280,10 +283,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - rev: HEAD
+          - rev: v3.6.0
             args: --log-level=debug stratisd_cert --verify-devices --monitor-dbus --highest-revision-number=6
-          - rev: v3.5.2
-            args: stratisd_cert --verify-devices
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3