Skip to content

Commit 2131504

Browse files
authored
Merge pull request #2835 from mulkieran/fix-up-ci
stratisd 2.4.3 release
2 parents 8fc1459 + 9bdf655 commit 2131504

File tree

89 files changed

+1124
-1456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1124
-1456
lines changed

.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.49.0"
1+
msrv = "1.54.0"

.githooks/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ make fmt-travis && make build && make build-extras && make build-min && make tes
55
export PYTHONPATH=$PWD/tests/client-dbus/src
66

77
cd tests/client-dbus && make fmt-travis && make lint || exit 1
8-
cd ../../code_maintenance && make fmt-travis && make lint || exit 1

.github/workflows/cargo.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
name: stratisd cargo CI
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
push:
7+
branches:
8+
- master
9+
- develop-2.4.2
10+
paths:
11+
- '**/Cargo.toml'
12+
pull_request:
13+
branches:
14+
- master
15+
- develop-2.4.2
16+
paths:
17+
- '**/Cargo.toml'
18+
19+
# Allows you to run this workflow manually from the Actions tab
20+
workflow_dispatch:
21+
22+
jobs:
23+
checks-with-ci-repo:
24+
strategy:
25+
matrix:
26+
include:
27+
# yamllint disable rule:line-length
28+
- task: |
29+
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
30+
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f34 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
31+
runs-on: ubuntu-18.04
32+
container:
33+
image: fedora:34 # CURRENT DEVELOPMENT ENVIRONMENT
34+
steps:
35+
- uses: actions/checkout@v2
36+
- name: Install dependencies for Fedora
37+
run: >
38+
dnf install -y
39+
clang
40+
curl
41+
cryptsetup-devel
42+
dbus-devel
43+
git
44+
libblkid-devel
45+
make
46+
openssl-devel
47+
python-requests
48+
python-semantic_version
49+
systemd-devel
50+
- uses: actions-rs/toolchain@v1
51+
with:
52+
components: cargo
53+
toolchain: 1.56.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
54+
override: true
55+
- name: Check out ci repo
56+
run: git clone https://github.com/stratis-storage/ci.git
57+
- name: Run ${{ matrix.task }}
58+
run: ${{ matrix.task }}
59+
working-directory: ./ci/dependency_management

.github/workflows/dummy.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: stratisd dummy CI
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
push:
7+
branches:
8+
- patch-2.4.2
9+
pull_request:
10+
branches:
11+
- patch-2.4.2
12+
13+
workflow_dispatch:
14+
15+
jobs:
16+
dummy:
17+
runs-on: ubuntu-18.04
18+
steps:
19+
- name: Run dummy test
20+
run: echo "I exist to be Required in Github branch protection rules"

0 commit comments

Comments
 (0)