Skip to content

Commit

Permalink
chore: merge release branch in to master
Browse files Browse the repository at this point in the history
Perform GitFlow release actions for release v1.0.0
  • Loading branch information
GlennBullingham committed Jan 18, 2022
2 parents 39e2d16 + 6530cc6 commit 62f82ea
Show file tree
Hide file tree
Showing 317 changed files with 41,680 additions and 9,205 deletions.
1 change: 1 addition & 0 deletions bors.toml → .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ block_labels = [ "DO NOT MERGE", "wip" ]
cut_body_after = "---"
committer.name = "mayastor-bors"
committer.email = "[email protected]"
commit_title = "chore(bors): merge pull request ${PR_REFS}"
5 changes: 0 additions & 5 deletions .github/workflows/pr-commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,3 @@ jobs:
first_commit=$(curl ${{ github.event.pull_request.commits_url }} 2>/dev/null | jq '.[0].sha' | sed 's/"//g')
last_commit=HEAD^2 # don't lint the merge commit
npx commitlint --from $first_commit~1 --to $last_commit -V
- name: Lint Pull Request
env:
TITLE: ${{ github.event.pull_request.title }}
BODY: ${{ github.event.pull_request.body }}
run: export NL=; printenv TITLE NL BODY | npx commitlint -V
25 changes: 25 additions & 0 deletions .github/workflows/release_artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: "Release Artifacts"
on:
push:
branches:
- master
- 'release/**'

jobs:
kubectl-plugin:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@v15
with:
nix_path: nixpkgs=channel:nixos
- run: nix-build -A utils.release.linux-musl.kubectl-plugin
- uses: actions/upload-artifact@v2
with:
name: kubectl-mayastor
path: ./result/bin/kubectl-mayastor
- run: nix-build -A utils.release.windows-gnu.kubectl-plugin
- uses: actions/upload-artifact@v2
with:
name: kubectl-mayastor.exe
path: ./result/bin/kubectl-mayastor.exe
19 changes: 17 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
**/target
**/*.terraform*
**/*.tfstate*
**/rust-tags.*
/package-lock.json
**/target
/.idea
/default.etcd/
/node_modules/
/package-lock.json
/package.json
/result*
/tests/bdd/__pycache__/
/tests/bdd/openapi/
/tests/bdd/csi_pb2.py
/tests/bdd/csi_pb2_grpc.py
/chart/charts/
/chart/Chart.lock
/openapi/*
!/openapi/Cargo.toml
!/openapi/build.rs
/tests/bdd/common/__pycache__
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "rpc/mayastor-api"]
path = rpc/mayastor-api
url = https://github.com/openebs/mayastor-api
50 changes: 36 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
repos:
- repo: https://github.com/nix-community/nixpkgs-fmt
rev: master
rev: v1.2.0
hooks:
- id: nixpkgs-fmt
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v4.0.1
hooks:
- id: trailing-whitespace
exclude: openapi/
- repo: local
hooks:
- id: rust-style
name: Rust style
description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
entry: cargo fmt --all -- --check
pass_filenames: true
types: [file, rust]
- id: openapi-check
name: OpenApi Code Generator
description: Ensures OpenApi bindings are up to date
entry: ./scripts/generate-openapi-bindings.sh
args: ["--changes"]
pass_filenames: false
language: system
- id: rust-lint
name: Rust lint
Expand All @@ -23,18 +24,39 @@ repos:
pass_filenames: false
types: [file, rust]
language: system
- id: rust-style
name: Rust style
description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
entry: cargo fmt --all -- --check
exclude: openapi/
pass_filenames: true
types: [file, rust]
language: system
- id: commit-lint
name: Commit Lint
description: Runs commitlint against the commit message.
language: system
entry: bash -c "npm install @commitlint/config-conventional @commitlint/cli; cat $1 | npx commitlint"
args: [$1]
stages: [commit-msg]
- id: openapi-check
name: OpenApi Generator
description: Ensures OpenApi spec is up to date
entry: ./scripts/openapi-check.sh
args: ["--changes"]
- id: python-check
name: python lint
entry: black
description: runs black against the python code
pass_filenames: true
types: [file, python]
language: system
- id: crd-check
name: CRD Generator
description: Ensures the Operator CRD files are up to date
entry: ./scripts/generate-crds.sh
args: [ "--changes" ]
pass_filenames: false
language: system
- id: helm-develop-deploy
name: Helm Generator
description: Ensures the deploy is updated with the develop yamls
entry: ./scripts/generate-deploy-yamls.sh
args: [ "-c", "develop" ]
pass_filenames: false
language: system

15 changes: 8 additions & 7 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# changed from 100 to 80
max_width = 80
max_width = 100
# default is false
wrap_comments = true
comment_width = 80
# was true
struct_lit_single_line = false
#changed from Mixed
imports_layout = "HorizontalVertical"
comment_width = 100
struct_lit_single_line = true
imports_layout = "Mixed"
# changed from Preserve (merge_imports = false)
imports_granularity="Crate"
#default false
spaces_around_ranges = true
# was 2015
edition = "2018"

ignore = [
"openapi"
]
Loading

0 comments on commit 62f82ea

Please sign in to comment.