Skip to content

Commit

Permalink
chore: manual merge release to master
Browse files Browse the repository at this point in the history
Manual conflict resolution whilst merging
release/1.0 to master
  • Loading branch information
GlennBullingham committed Jan 18, 2022
2 parents d7af633 + 0527045 commit d8d35a6
Show file tree
Hide file tree
Showing 292 changed files with 14,762 additions and 43,437 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Bug report
about: Create a report to help us improve
title: ''
labels: new
assignees: jkryl
assignees: GlennBullingham

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
assignees: GlennBullingham

---

Expand Down
6 changes: 3 additions & 3 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ addAssignees: false
# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- blaisedias
- chriswldenyer
- cjones1024
- jonathan-teh
- jkryl
- gila
- jonathan-teh
- paulyoong
- chriswldenyer
- tiagolobocastro
- mtzaurus

# A list of keywords to be skipped the process that add reviewers if pull requests include it
skipKeywords:
Expand Down
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ artifacts/
**/__pycache__
/chart/charts/
ansible-hosts
/test/python/csi_pb2.py
/test/python/csi_pb2_grpc.py
/test/python/mayastor_pb2.py
/test/python/mayastor_pb2_grpc.py
/test/python/venv/*
/package.json
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
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ repos:
entry: bash -c "npm install @commitlint/config-conventional @commitlint/cli; cat $1 | npx commitlint"
args: [$1]
stages: [commit-msg]
- id: python-check
name: python lint
entry: black
description: runs black against the python code
pass_filenames: true
types: [file, python]
language: system
Loading

0 comments on commit d8d35a6

Please sign in to comment.