From 05e9b28795e78fb14adb5c4d0f4981c9d1f2ba8b Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 10:50:26 +0600 Subject: [PATCH 1/3] chore(SNP-903): FVM update --- .fvm/fvm_config.json | 4 ---- .fvmrc | 3 +++ .gitignore | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 .fvm/fvm_config.json create mode 100644 .fvmrc diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index ba129cf..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.10.0", - "flavors": {} -} \ No newline at end of file diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..2549cd2 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.10.0" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 99ddad1..c0ae71b 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,9 @@ .pub-cache/ .pub/ build/ -.fvm/flutter_sdk + +# FVM +.fvm/ # Android related **/android/**/gradle-wrapper.jar From 3f0ed7df3d7f680f854824ee9b437700f35fd85b Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 17:03:42 +0600 Subject: [PATCH 2/3] chore(SNP-903): update GitHub Action workflows --- .github/workflows/main.yml | 17 +++------ .github/workflows/new_issue_to_pyrus_task.yml | 35 +++++++++++++++++++ .github/workflows/new_issues_label.yml | 2 +- .github/workflows/new_pull_request_label.yml | 2 +- .../new_pull_request_main_actions.yml | 2 +- .github/workflows/publish_to_pub.yml | 18 +++++----- 6 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/new_issue_to_pyrus_task.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a4a25a9..db4dd38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,30 +2,21 @@ name: "Main" on: pull_request: - branches: - - main - - dev - push: - branches: - - main - - dev - tags-ignore: - - '**' jobs: get_fvm_version: outputs: - flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + flutter_version: ${{ steps.fvm_version.outputs.flutter }} name: "Get Flutter version from FVM" runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: fvm_version - uses: zoexx/github-action-json-file-properties@1.0.4 + uses: zoexx/github-action-json-file-properties@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version diff --git a/.github/workflows/new_issue_to_pyrus_task.yml b/.github/workflows/new_issue_to_pyrus_task.yml new file mode 100644 index 0000000..36813f6 --- /dev/null +++ b/.github/workflows/new_issue_to_pyrus_task.yml @@ -0,0 +1,35 @@ +name: "Create Pyrus task from issue" + +on: + issues: + types: + - reopened + - opened + +jobs: + get_package_name: + name: Get package name + runs-on: ubuntu-latest + outputs: + package_name: ${{ steps.parse_pubspec.outputs.name }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Parsing pubspec.yaml + id: parse_pubspec + uses: actions-tools/yaml-outputs@v2 + with: + file-path: 'pubspec.yaml' + + call_create_pyrus_task_from_issue: + name: Create Pyrus task from issue + needs: get_package_name + uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issue_to_pyrus_task.yml@main + with: + PACKAGE_NAME: ${{ needs.get_package_name.outputs.package_name }} + ISSUE_TITLE: ${{ github.event.issue.title }} + ISSUE_BODY: ${{ github.event.issue.body }} + ISSUE_LINK: ${{ github.event.issue.html_url }} + secrets: + LOGIN: ${{ secrets.PYRUS_BOT_LOGIN }} + SECURITY_KEY: ${{ secrets.PYRUS_BOT_SECRET_KEY }} diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml index 40d0a17..58890cc 100644 --- a/.github/workflows/new_issues_label.yml +++ b/.github/workflows/new_issues_label.yml @@ -13,4 +13,4 @@ jobs: label_issues: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issues_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} diff --git a/.github/workflows/new_pull_request_label.yml b/.github/workflows/new_pull_request_label.yml index fb21084..9fd27c2 100644 --- a/.github/workflows/new_pull_request_label.yml +++ b/.github/workflows/new_pull_request_label.yml @@ -14,4 +14,4 @@ jobs: if: ${{ github.event.label.name == 'WIP' }} uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} diff --git a/.github/workflows/new_pull_request_main_actions.yml b/.github/workflows/new_pull_request_main_actions.yml index ccf208e..0bbf1ca 100644 --- a/.github/workflows/new_pull_request_main_actions.yml +++ b/.github/workflows/new_pull_request_main_actions.yml @@ -19,4 +19,4 @@ jobs: pull_request: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_pull_request_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} \ No newline at end of file + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }} \ No newline at end of file diff --git a/.github/workflows/publish_to_pub.yml b/.github/workflows/publish_to_pub.yml index 18e7103..504a9be 100644 --- a/.github/workflows/publish_to_pub.yml +++ b/.github/workflows/publish_to_pub.yml @@ -8,17 +8,17 @@ on: jobs: get_fvm_version: outputs: - flutter_version: ${{ steps.fvm_version.outputs.flutterSdkVersion }} + flutter_version: ${{ steps.fvm_version.outputs.flutter }} name: "Get Flutter version from FVM" runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: fvm_version - uses: zoexx/github-action-json-file-properties@1.0.4 + uses: zoexx/github-action-json-file-properties@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version @@ -34,13 +34,13 @@ jobs: secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - package-publishing: - needs: [analysis, testing] + needs: [analysis, testing, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/publish_to_pub.yml@main with: + flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} PANA_TOTAL: "100" secrets: - PUB_CREDENTIAL_JSON: ${{ secrets.PUB_CREDENTIAL_JSON }} - PUB_OAUTH_ACCESS_TOKEN: ${{ secrets.PUB_OAUTH_ACCESS_TOKEN }} - PUB_OAUTH_REFRESH_TOKEN: ${{ secrets.PUB_OAUTH_REFRESH_TOKEN }} + PUB_CREDENTIAL_JSON: ${{ secrets.SURF_PUB_CREDENTIAL_JSON }} + PUB_OAUTH_ACCESS_TOKEN: ${{ secrets.SURF_PUB_OAUTH_ACCESS_TOKEN }} + PUB_OAUTH_REFRESH_TOKEN: ${{ secrets.SURF_PUB_OAUTH_REFRESH_TOKEN }} From 7daa0030b1d902b4f7ea396c3b498b26b7fb5aa2 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 17:04:22 +0600 Subject: [PATCH 3/3] chore(SNP-903): add new PR and issues templates --- .github/ISSUE_TEMPLATE/bug_report.md | 9 ++- .github/ISSUE_TEMPLATE/config.yml | 5 ++ .../ISSUE_TEMPLATE/documentation_update.md | 14 ++-- .github/ISSUE_TEMPLATE/feature_request.md | 20 +++-- .github/PULL_REQUEST_TEMPLATE.md | 74 ++----------------- .github/PULL_REQUEST_TEMPLATE/bug_fix.md | 10 +-- .../documentation_update.md | 10 +-- .github/PULL_REQUEST_TEMPLATE/new_feature.md | 10 +-- 8 files changed, 35 insertions(+), 117 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5460d88..9f615a5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,10 +1,13 @@ --- name: Bug report -about: Something is wrong with Flutter Bottom Sheet. +about: Something is wrong. title: "[BUG] " labels: bug --- - + ## Expected behavior @@ -52,4 +55,4 @@ What did you try to solve the problem? - [ ] Added isolated way to reproduce the bug. - [ ] Specified Flutter, Dart version and platforms. - [ ] Attached error code and logs. -- [ ] All unspecified fields in the Issue description deleted. +- [ ] All unspecified fields in the Issue description are deleted. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..6689749 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: SurfGear telegram chat + url: https://t.me/SurfGear + about: Please ask and answer questions here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/documentation_update.md b/.github/ISSUE_TEMPLATE/documentation_update.md index 0c7bf5b..3bb3aea 100644 --- a/.github/ISSUE_TEMPLATE/documentation_update.md +++ b/.github/ISSUE_TEMPLATE/documentation_update.md @@ -2,23 +2,19 @@ name: Documentation update about: Fixing a problem or improve in an existing docs page. labels: documentation -assignees: MbIXjkee --- - +## Specify package name + ## Describe what scenario you think is uncovered by the existing examples / articles - -A clear and concise description of the problem that you want explained. + ## Describe why existing examples / articles do not cover this case - -Explain which examples / articles you have seen before making this request, and -why they did not help you with your problem. + ## Additional context - -Add any other context or screenshots about the documentation request here. + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index d572b13..2c2f243 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,24 +1,22 @@ --- -name: Feature Request -about: I'd like Flutter Bottom Sheet to do something new. +name: Feature request +about: I'd like SurfGear team to do something new. labels: enhancement -assignees: MbIXjkee --- - +## Specify package name + ## What is the new or updated feature that you are suggesting? - -A clear and concise description of what you want to happen. + ## Why should this feature be included? - -Is your feature request related to a problem? Please describe a clear and concise description of what the problem is. If you investigated any alternative solutions please describe. + ## Additional context - -Please provide any other context or screenshots about the feature request here. + \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 73138b8..ba5f1df 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,70 +1,6 @@ -## Related tasks - +Tap on "Preview" ⤴ - -## Dependence on other Pull Requests (optional) - - -## Background (optional) - - -## Changes - - -## Troubles (optional) - - -## Note (optional) - - -## Checklist for self-check -- [ ] Commits and PRs have been filed according to [the rules on the project](https://github.com/surfstudio/surf-flutter-app-template#workflow-in-a-repository). -- [ ] The author is marked as an assigne and assigned mandatory reviewers. -- [ ] Required labels marked -- [ ] Specified related tasks and/or related PRs. -- [ ] Specified Changes. -- [ ] Attached videos/screenshots demonstrating the fix/feature. -- [ ] All unspecified fields in the PR description deleted. -- [ ] New code covered by tests. - -## Checklist for reviewers -- [ ] CI passed successfully _(with a green check mark)_. -- [ ] PR is atomic, by volume no more than 400 (+-) corrected lines (not including codogen). - -Design: -- [ ] System design corresponds to the agreements on structure and architecture on the project. -- [ ] The code is decomposed into necessary and sufficient components. - -Functionality: -- [ ] The code solves the problem. -- [ ] Any changes to the user interface are reasonable and look good. - -Complexity: -- [ ] The code is clear, easy to read, functions are small, no more than 50 lines. -- [ ] The logic is not overcomplicated, there is no overengineering (no code sections that may be needed in the future, but no one knows about it). - -Tests: -- [ ] Updated or added tests for mandatory components. -- [ ] The tests are correct, helpful, and well designed/developed. - -Naming: -- [ ] The naming of variables, methods, classes and other components is understandable. - -Comments: -- [ ] The comments are understandable and helpful. - -Documentation: -- [ ] All labels are correct -- [ ] Technical documentation updated (after approval, updates last reviewer). +And choose one of the templates: +* [Bugfix PR](?expand=1&template=bug_fix.md) +* [New feature PR](?expand=1&template=new_feature.md) +* [Documentation update PR](?expand=1&template=documentation_update.md) \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md index b700751..262175d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md +++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md @@ -1,23 +1,17 @@ ---- -name: Bug fix -about: Fixing a problem with Flutter Bottom Sheet. -assignees: MbIXjkee ---- - - ## Checklist - [ ] Have you added an explanation of what your changes do and why you'd like us to include them? - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? - [ ] Have the docs been updated to match the changes in the PR? - [ ] Have the tests been updated to match the changes in the PR? +- [ ] Attached videos/screenshots demonstrating the fix/feature. - [ ] Have you run the tests locally to confirm they pass? ## Changes diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md index c9565ec..b4dd21d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md +++ b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md @@ -1,20 +1,12 @@ ---- -name: Documentation update -about: Fixing a problem or improve in an existing docs page. -labels: documentation -assignees: MbIXjkee ---- - - ## Checklist - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? ## Changes diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md index 7ebbb47..1625c60 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -1,23 +1,17 @@ ---- -name: New feature -labels: enhancement -assignees: MbIXjkee ---- - - ## Checklist - [ ] Have you added an explanation of what your changes do and why you'd like us to include them? - [ ] Is there an existing issue for this PR? - - _link issue here_ + - _link issue here_ (use keywords like `fix`, `close`, `resolve` etc. if necessary) - [ ] Have the files been linted and formatted? - [ ] Have the docs been updated to match the changes in the PR? - [ ] Have the tests been updated to match the changes in the PR? +- [ ] Attached videos/screenshots demonstrating the fix/feature. - [ ] Have you run the tests locally to confirm they pass? ## New Features