Skip to content

Commit 62f82ea

Browse files
chore: merge release branch in to master
Perform GitFlow release actions for release v1.0.0
2 parents 39e2d16 + 6530cc6 commit 62f82ea

File tree

317 files changed

+41680
-9205
lines changed

Some content is hidden

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

317 files changed

+41680
-9205
lines changed

bors.toml renamed to .github/bors.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ block_labels = [ "DO NOT MERGE", "wip" ]
66
cut_body_after = "---"
77
committer.name = "mayastor-bors"
88
committer.email = "[email protected]"
9+
commit_title = "chore(bors): merge pull request ${PR_REFS}"

.github/workflows/pr-commitlint.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,3 @@ jobs:
1717
first_commit=$(curl ${{ github.event.pull_request.commits_url }} 2>/dev/null | jq '.[0].sha' | sed 's/"//g')
1818
last_commit=HEAD^2 # don't lint the merge commit
1919
npx commitlint --from $first_commit~1 --to $last_commit -V
20-
- name: Lint Pull Request
21-
env:
22-
TITLE: ${{ github.event.pull_request.title }}
23-
BODY: ${{ github.event.pull_request.body }}
24-
run: export NL=; printenv TITLE NL BODY | npx commitlint -V
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: "Release Artifacts"
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- 'release/**'
7+
8+
jobs:
9+
kubectl-plugin:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/[email protected]
13+
- uses: cachix/install-nix-action@v15
14+
with:
15+
nix_path: nixpkgs=channel:nixos
16+
- run: nix-build -A utils.release.linux-musl.kubectl-plugin
17+
- uses: actions/upload-artifact@v2
18+
with:
19+
name: kubectl-mayastor
20+
path: ./result/bin/kubectl-mayastor
21+
- run: nix-build -A utils.release.windows-gnu.kubectl-plugin
22+
- uses: actions/upload-artifact@v2
23+
with:
24+
name: kubectl-mayastor.exe
25+
path: ./result/bin/kubectl-mayastor.exe

.gitignore

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1-
**/target
1+
**/*.terraform*
2+
**/*.tfstate*
23
**/rust-tags.*
3-
/package-lock.json
4+
**/target
45
/.idea
6+
/default.etcd/
7+
/node_modules/
8+
/package-lock.json
9+
/package.json
510
/result*
11+
/tests/bdd/__pycache__/
12+
/tests/bdd/openapi/
13+
/tests/bdd/csi_pb2.py
14+
/tests/bdd/csi_pb2_grpc.py
15+
/chart/charts/
16+
/chart/Chart.lock
17+
/openapi/*
18+
!/openapi/Cargo.toml
19+
!/openapi/build.rs
20+
/tests/bdd/common/__pycache__

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "rpc/mayastor-api"]
2+
path = rpc/mayastor-api
3+
url = https://github.com/openebs/mayastor-api

.pre-commit-config.yaml

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
repos:
22
- repo: https://github.com/nix-community/nixpkgs-fmt
3-
rev: master
3+
rev: v1.2.0
44
hooks:
55
- id: nixpkgs-fmt
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v2.3.0
7+
rev: v4.0.1
88
hooks:
99
- id: trailing-whitespace
10+
exclude: openapi/
1011
- repo: local
1112
hooks:
12-
- id: rust-style
13-
name: Rust style
14-
description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
15-
entry: cargo fmt --all -- --check
16-
pass_filenames: true
17-
types: [file, rust]
13+
- id: openapi-check
14+
name: OpenApi Code Generator
15+
description: Ensures OpenApi bindings are up to date
16+
entry: ./scripts/generate-openapi-bindings.sh
17+
args: ["--changes"]
18+
pass_filenames: false
1819
language: system
1920
- id: rust-lint
2021
name: Rust lint
@@ -23,18 +24,39 @@ repos:
2324
pass_filenames: false
2425
types: [file, rust]
2526
language: system
27+
- id: rust-style
28+
name: Rust style
29+
description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
30+
entry: cargo fmt --all -- --check
31+
exclude: openapi/
32+
pass_filenames: true
33+
types: [file, rust]
34+
language: system
2635
- id: commit-lint
2736
name: Commit Lint
2837
description: Runs commitlint against the commit message.
2938
language: system
3039
entry: bash -c "npm install @commitlint/config-conventional @commitlint/cli; cat $1 | npx commitlint"
3140
args: [$1]
3241
stages: [commit-msg]
33-
- id: openapi-check
34-
name: OpenApi Generator
35-
description: Ensures OpenApi spec is up to date
36-
entry: ./scripts/openapi-check.sh
37-
args: ["--changes"]
42+
- id: python-check
43+
name: python lint
44+
entry: black
45+
description: runs black against the python code
46+
pass_filenames: true
47+
types: [file, python]
48+
language: system
49+
- id: crd-check
50+
name: CRD Generator
51+
description: Ensures the Operator CRD files are up to date
52+
entry: ./scripts/generate-crds.sh
53+
args: [ "--changes" ]
54+
pass_filenames: false
55+
language: system
56+
- id: helm-develop-deploy
57+
name: Helm Generator
58+
description: Ensures the deploy is updated with the develop yamls
59+
entry: ./scripts/generate-deploy-yamls.sh
60+
args: [ "-c", "develop" ]
3861
pass_filenames: false
3962
language: system
40-

.rustfmt.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
# changed from 100 to 80
2-
max_width = 80
1+
max_width = 100
32
# default is false
43
wrap_comments = true
5-
comment_width = 80
6-
# was true
7-
struct_lit_single_line = false
8-
#changed from Mixed
9-
imports_layout = "HorizontalVertical"
4+
comment_width = 100
5+
struct_lit_single_line = true
6+
imports_layout = "Mixed"
107
# changed from Preserve (merge_imports = false)
118
imports_granularity="Crate"
129
#default false
1310
spaces_around_ranges = true
1411
# was 2015
1512
edition = "2018"
13+
14+
ignore = [
15+
"openapi"
16+
]

0 commit comments

Comments
 (0)