From 401744111baa5c0329d0b2319a112035e11ad8fd Mon Sep 17 00:00:00 2001 From: Krzysztof Szyper Date: Tue, 29 Jun 2021 13:52:32 +0200 Subject: [PATCH] Sync with new template repository. Small fixed. Removed not needed files. --- .github/ISSUE_TEMPLATE/BUGFIX.md | 25 ------------------------- .github/ISSUE_TEMPLATE/DOCUMENTATION.md | 23 ----------------------- .github/ISSUE_TEMPLATE/FEATURE.md | 24 ------------------------ .github/ISSUE_TEMPLATE/config.yml | 8 -------- .github/PULL_REQUEST_TEMPLATE.md | 25 ------------------------- .github/workflows/PUSH-MASTER.yml | 7 +++++++ .github/workflows/PUSH-OTHER.yml | 25 +++++++++++++++++++------ .gitignore | 4 ++++ CONTRIBUTING.md | 2 +- 9 files changed, 31 insertions(+), 112 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/BUGFIX.md delete mode 100644 .github/ISSUE_TEMPLATE/DOCUMENTATION.md delete mode 100644 .github/ISSUE_TEMPLATE/FEATURE.md delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/BUGFIX.md b/.github/ISSUE_TEMPLATE/BUGFIX.md deleted file mode 100644 index 37266ce..0000000 --- a/.github/ISSUE_TEMPLATE/BUGFIX.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Bug report -about: Report any bugs for this project -title: 'TITLE' -labels: 'bugfix' -assignees: 'devops-infra/christophshyper' - ---- -## :memo: Brief description - - - - - -## :warning: Checklist -* [ ] Provided a clear and concise description of what the bug is. -* [ ] Given a clear and concise description of what was expected to happen. -* [ ] Provided an information how to reproduce the error. -* [ ] If applicable, added screenshots to help explain the issue. -* [ ] Added any other context about the issue that can help to understand it. -* [ ] Associated pull request has been already created and link was provided. - - -*Check [CONTRIBUTING.md](https://github.com/devops-infra/.github/blob/master/CONTRIBUTING.md) and -[CODE_OF_CONDUCT.md](https://github.com/devops-infra/.github/blob/master/CODE_OF_CONDUCT.md) for more information* diff --git a/.github/ISSUE_TEMPLATE/DOCUMENTATION.md b/.github/ISSUE_TEMPLATE/DOCUMENTATION.md deleted file mode 100644 index 99d3f02..0000000 --- a/.github/ISSUE_TEMPLATE/DOCUMENTATION.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Update documentation -about: Request update of the documentation. -title: 'TITLE' -labels: 'documentation' -assignees: 'devops-infra/christophshyper' - ---- -## :memo: Brief description - - - - - -## :warning: Checklist -* [ ] Provided a clear and concise description of what the issue is. -* [ ] Given a clear and concise description of what is expected. -* [ ] Added any other context or screenshots about the feature request. -* [ ] Associated pull request has been already created and link was provided. - - -*Check [CONTRIBUTING.md](https://github.com/devops-infra/.github/blob/master/CONTRIBUTING.md) and -[CODE_OF_CONDUCT.md](https://github.com/devops-infra/.github/blob/master/CODE_OF_CONDUCT.md) for more information* diff --git a/.github/ISSUE_TEMPLATE/FEATURE.md b/.github/ISSUE_TEMPLATE/FEATURE.md deleted file mode 100644 index 06cb2f9..0000000 --- a/.github/ISSUE_TEMPLATE/FEATURE.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: 'TITLE' -labels: 'feature' -assignees: 'devops-infra/christophshyper' - ---- -## :memo: Brief description - - - - - -## :warning: Checklist -* [ ] Provided a clear and concise description of what the issue is. -* [ ] Given a clear and concise description of what is expected. -* [ ] Proposed a clear and concise description of any alternative solutions or other features. -* [ ] Added any other context or screenshots about the feature request. -* [ ] Associated pull request has been already created and link was provided. - - -*Check [CONTRIBUTING.md](https://github.com/devops-infra/.github/blob/master/CONTRIBUTING.md) and -[CODE_OF_CONDUCT.md](https://github.com/devops-infra/.github/blob/master/CODE_OF_CONDUCT.md) for more information* diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 6d9217c..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Contributing details - url: https://github.com/devops-infra/.github/blob/master/CONTRIBUTING.md - about: Details about contributing rules - - name: Code of Conduct - url: https://github.com/devops-infra/.github/blob/master/CODE_OF_CONDUCT.md - about: Details about Code of Conduct diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 94cf1dd..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ -## :memo: Brief description - - - - - - - -## :computer: Commits - - - - -## :file_folder: Modified files - - - - -## :warning: Additional information -* [ ] Pushed to a branch with a proper name and provided proper commit message. -* [ ] Provided a clear and concise description of what the issue is. - - -*Check [CONTRIBUTING.md](https://github.com/devops-infra/.github/blob/master/CONTRIBUTING.md) and -[CODE_OF_CONDUCT.md](https://github.com/devops-infra/.github/blob/master/CODE_OF_CONDUCT.md) for more information* diff --git a/.github/workflows/PUSH-MASTER.yml b/.github/workflows/PUSH-MASTER.yml index 6b287c8..f2e1690 100644 --- a/.github/workflows/PUSH-MASTER.yml +++ b/.github/workflows/PUSH-MASTER.yml @@ -13,10 +13,17 @@ jobs: - name: Checkout repository uses: actions/checkout@v2.3.4 + - name: Download labels' config + shell: bash + run: | + mkdir -p .tmp + curl -LsS https://raw.githubusercontent.com/devops-infra/.github/master/.github/labels.yml -o .tmp/labels.yml + - name: Update labels uses: crazy-max/ghaction-github-labeler@v3.1.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} + yaml-file: .tmp/labels.yml example: name: Example diff --git a/.github/workflows/PUSH-OTHER.yml b/.github/workflows/PUSH-OTHER.yml index cde4278..a6c0716 100644 --- a/.github/workflows/PUSH-OTHER.yml +++ b/.github/workflows/PUSH-OTHER.yml @@ -14,10 +14,17 @@ jobs: - name: Checkout repository uses: actions/checkout@v2.3.4 + - name: Download labels' config + shell: bash + run: | + mkdir -p .tmp + curl -LsS https://raw.githubusercontent.com/devops-infra/.github/master/.github/labels.yml -o .tmp/labels.yml + - name: Update labels - dry run uses: crazy-max/ghaction-github-labeler@v3.1.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} + yaml-file: .tmp/labels.yml dry-run: true example: @@ -38,6 +45,12 @@ jobs: with: fetch-depth: 0 + - name: Download Pull Request template + shell: bash + run: | + mkdir -p .tmp + curl -LsS https://raw.githubusercontent.com/devops-infra/.github/master/PULL_REQUEST_TEMPLATE.md -o .tmp/PULL_REQUEST_TEMPLATE.md + - name: Create pull request - bugfix (conditional) if: startsWith(github.ref, 'refs/heads/bugfix') uses: devops-infra/action-pull-request@master @@ -45,7 +58,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} label: bugfix - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md get_diff: true - name: Create pull request - dependency (conditional) @@ -55,7 +68,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} label: dependency - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md get_diff: true - name: Create pull request - documentation (conditional) @@ -65,7 +78,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} label: documentation - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md get_diff: true - name: Create pull request - feature (conditional) @@ -75,7 +88,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} label: feature - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md get_diff: true - name: Create pull request - test (conditional) @@ -86,7 +99,7 @@ jobs: assignee: ${{ github.actor }} reviewer: ${{ github.actor }} label: test - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md draft: true get_diff: true @@ -97,5 +110,5 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} assignee: ${{ github.actor }} label: feature - template: .github/PULL_REQUEST_TEMPLATE.md + template: .tmp/PULL_REQUEST_TEMPLATE.md get_diff: true diff --git a/.gitignore b/.gitignore index 575d2d8..1a77c83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +################################################################################################### +# Custom +.tmp/ + ################################################################################################### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a95a054..02fb8f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Rules for contribution are very simple. * Updates of dependent packages should be pushed to branches starting with `dependency/...`. * Updates to documentation should be pushed to branches starting with `documentation/...`. * New features should be pushed to branches starting with `feature/...`. -* For testing linting, build process, etc. without opening use branches starting with `test/...`. +* For testing linting, build process, etc. with opening draft PR use branches starting with `test/...`. * If the changes apply to more than one category any other name best fitting should be used.