Skip to content

Commit

Permalink
Merge pull request #3344 from mulkieran/set-up-3.5.4-branch
Browse files Browse the repository at this point in the history
Set up 3.5.4 branch
  • Loading branch information
mulkieran authored May 15, 2023
2 parents 3b8e7f7 + 577f599 commit 6477898
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 671 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: stratisd cargo CI
on:
push:
branches:
- master
- patch-3.5.4
paths:
- '**/Cargo.toml'
- '.github/workflows/cargo.yml'
pull_request:
branches:
- master
- patch-3.5.4
paths:
- '**/Cargo.toml'
- '.github/workflows/cargo.yml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: stratisd dummy CI
on:
push:
branches:
- master
- patch-3.5.4
pull_request:
branches:
- master
- patch-3.5.4

workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ name: stratisd CI on fedora
on:
push:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
- 'README_tests.md'
- 'tests/**'
pull_request:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ name: stratisd CI
on:
push:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
- 'README_tests.md'
- 'tests/**'
pull_request:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
Expand Down Expand Up @@ -161,6 +161,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.5.1
run: git checkout tags/v3.5.1 -b version-3.5.1
working-directory: ./stratis-cli
- name: Run stratis-cli tests
run: >
RUST_LOG=stratisd=debug
Expand Down Expand Up @@ -347,6 +350,9 @@ jobs:
run: sudo udevadm control --reload
- name: Clone testing repo
run: git clone https://github.com/stratis-storage/testing.git
- name: Use testing 3.5.2
run: git checkout tags/v3.5.2 -b version-3.5.2
working-directory: ./testing
- name: Run stratisd_cert.py using Rust ${{ matrix.toolchain }}
run: >
sudo
Expand Down
278 changes: 0 additions & 278 deletions .github/workflows/nightly.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ name: stratisd python-based tests
on:
push:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
- 'README_tests.md'
pull_request:
branches:
- master
- patch-3.5.4
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ name: stratisd support CI
on:
push:
branches:
- master
- patch-3.5.4
paths:
- "**/*.yml"
- "tests/**"
- "!tests/**/README.*"
pull_request:
branches:
- master
- patch-3.5.4
paths:
- "**/*.yml"
- "tests/**"
Expand Down
Loading

0 comments on commit 6477898

Please sign in to comment.