Skip to content

Commit

Permalink
Merge pull request #3203 from mulkieran/setup-patch-branch
Browse files Browse the repository at this point in the history
Setup patch branch
  • Loading branch information
mulkieran authored Dec 14, 2022
2 parents 2648c58 + cdbb8c0 commit 4ee8693
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 416 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.4.2
paths:
- '**/Cargo.toml'
- '.github/workflows/cargo.yml'
pull_request:
branches:
- master
- patch-3.4.2
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.4.2
pull_request:
branches:
- master
- patch-3.4.2

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.4.2
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
- 'README_tests.md'
- 'tests/**'
pull_request:
branches:
- master
- patch-3.4.2
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
Expand Down
7 changes: 5 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.4.2
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
- 'README_tests.md'
- 'tests/**'
pull_request:
branches:
- master
- patch-3.4.2
paths-ignore:
- 'CHANGES.txt'
- '**/README.md'
Expand Down Expand Up @@ -138,6 +138,9 @@ jobs:
run: PROFILEDIR=debug make -f Makefile build-and-install
- name: Check out stratis-cli
run: git clone https://github.com/stratis-storage/stratis-cli.git
- name: Switch to version 3.4.0
run: git checkout tags/v3.4.0 -b v3.4.0
working-directory: ./stratis-cli
- name: Set up for D-Bus
run: |
mkdir -p /var/lib/dbus
Expand Down
310 changes: 0 additions & 310 deletions .github/workflows/nightly.yml

This file was deleted.

Loading

0 comments on commit 4ee8693

Please sign in to comment.