From 00c781419bb788b25d84137341d7301bc5baf9b5 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Thu, 22 Feb 2024 15:42:57 +0600 Subject: [PATCH 1/8] chore(SNP-903): fix check issue workflow path --- .github/workflows/check_issue.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_issue.yaml b/.github/workflows/check_issue.yaml index d29145f..83c1f00 100644 --- a/.github/workflows/check_issue.yaml +++ b/.github/workflows/check_issue.yaml @@ -8,7 +8,7 @@ on: jobs: check-issue: - uses: surfstudio/flutter-ci-workflows/.github/workflows/сheck_issues.yaml@main + uses: surfstudio/flutter-ci-workflows/.github/workflows/check_issues.yaml@main with: REPO_PATH: 'https://github.com/surfstudio/flutter-otp-autofill/issues/new/choose' ISSUE_TITLE: ${{ github.event.issue.title }} From 8d89f0444b342802a4ae66eeab24479e17d449c2 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Mon, 26 Feb 2024 20:04:25 +0600 Subject: [PATCH 2/8] chore(SNP-903): add issues to Pyrus task workflow --- .github/workflows/new_issue_to_pyrus_task.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/new_issue_to_pyrus_task.yml 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 }} From c8f65459cb2b6032e8398c804ac5fc417f533aac Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Mon, 26 Feb 2024 20:20:12 +0600 Subject: [PATCH 3/8] chore(SNP-903): update GitHub Action workflows --- .github/workflows/main.yml | 8 ++++---- .github/workflows/new_issues_label.yml | 3 ++- .github/workflows/new_pull_request_label.yml | 2 +- .../workflows/new_pull_request_main_actions.yml | 2 +- .github/workflows/publish_to_pub.yml | 16 ++++++++-------- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1962c97..db4dd38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,22 +1,22 @@ name: "Main" on: - pull_request + pull_request: 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@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml index 5319ce7..4e3d3d7 100644 --- a/.github/workflows/new_issues_label.yml +++ b/.github/workflows/new_issues_label.yml @@ -13,4 +13,5 @@ jobs: label_issues: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issues_label.yml@main secrets: - SECRET_ISSUES: ${{ secrets.SECRET_ISSUES }} + 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 eab8381..4b5443d 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@release with: - file_path: ".fvm/fvm_config.json" + file_path: ".fvmrc" analysis: needs: get_fvm_version @@ -32,8 +32,8 @@ jobs: with: flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - + CODECOV_TOKEN: ${{ secrets.SURFGEAR_CODECOV_TOKEN }} + package-publishing: needs: [analysis, testing, get_fvm_version] uses: surfstudio/flutter-ci-workflows/.github/workflows/publish_to_pub.yml@main @@ -41,6 +41,6 @@ jobs: 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 d5e821283976f7bfe4bc8caadce0a3e26fb8e0fd Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Mon, 26 Feb 2024 20:25:19 +0600 Subject: [PATCH 4/8] chore(SNP-903): add new PR and issues templates --- .github/ISSUE_TEMPLATE/bug_report.md | 67 ++++++++++------- .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, 69 insertions(+), 141 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 570b881..9f615a5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,45 +1,58 @@ --- name: Bug report -about: Something is wrong with Flutter OTP Autofill. +about: Something is wrong. title: "[BUG] " labels: bug -assignees: MbIXjkee --- - +## Expected behavior + -## Prior Issues - -Are there any existing issues or PRs that relate to this problem? If so, link them here. - -## Describe the bug +## Actual behavior + -A clear and concise description of what the bug is. -Please show the code you wrote as completely as possible. +## Video/Screenshot + -```dart -/// your code here -``` +## Steps to reproduce + -## Steps to Reproduce +## Details +Flutter version: -If the current behavior is a bug, please provide the steps to reproduce. +Dart version: -## What is the expected behavior? +Platform: -A clear and concise description of what you expected to happen. +## Logs and stacktrace + -## Additional context +## Any possible solutions + -* What package and OS are affected by this issue? Did this work in previous versions of a package? - -* If applicable, add screenshots to help explain your problem. +## What did you try to solve + -* Please provide output from `flutter doctor -v` and `flutter analyze`. - -* Add any other context about the problem here. +## Checklist for self-check +- [ ] Added expected and actual behavior. +- [ ] Added video or screenshot of bug. +- [ ] 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 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 93ab706..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 OTP Autofill 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 b248a26..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 OTP Autofill. -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 From b0ac9f562ceb6273d6e0a2bd91cb6522373b650e Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Mon, 26 Feb 2024 20:32:22 +0600 Subject: [PATCH 5/8] chore(SNP-903): FVM update --- .fvm/fvm_config.json | 4 ---- .fvmrc | 3 +++ .gitignore | 6 ++++-- 3 files changed, 7 insertions(+), 6 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 6e3d57e..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.7.6", - "flavors": {} -} \ No newline at end of file diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..c112b65 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.7.6" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1e7384b..ab10e89 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ .pub-cache/ .pub/ build/ -.fvm/flutter_sdk # Android related **/android/**/gradle-wrapper.jar @@ -76,4 +75,7 @@ coverage/ !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 \ No newline at end of file +!**/ios/**/default.perspectivev3 + +# FVM +.fvm/ \ No newline at end of file From 89c3c4204488aea6e5c1402acfc09d3e1abd03a9 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 10:09:47 +0600 Subject: [PATCH 6/8] chore(SNP-903): update gitignore --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ab10e89..3b6dfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,9 @@ .pub/ build/ +# FVM +.fvm/ + # Android related **/android/**/gradle-wrapper.jar **/android/.gradle @@ -75,7 +78,4 @@ coverage/ !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 !**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 - -# FVM -.fvm/ \ No newline at end of file +!**/ios/**/default.perspectivev3 \ No newline at end of file From 7c45741a5ee1d2f77a06a02451e5158773c4c1f9 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 10:14:58 +0600 Subject: [PATCH 7/8] chore(SNP-903): update GitHub Action workflows --- .github/workflows/publish_to_pub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_to_pub.yml b/.github/workflows/publish_to_pub.yml index 4b5443d..504a9be 100644 --- a/.github/workflows/publish_to_pub.yml +++ b/.github/workflows/publish_to_pub.yml @@ -32,7 +32,7 @@ jobs: with: flutter-version: ${{ needs.get_fvm_version.outputs.flutter_version }} secrets: - CODECOV_TOKEN: ${{ secrets.SURFGEAR_CODECOV_TOKEN }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} package-publishing: needs: [analysis, testing, get_fvm_version] From 0bceec2bfaa8683e4b90999b21b150e00ea79be1 Mon Sep 17 00:00:00 2001 From: Alex Martynov Date: Tue, 27 Feb 2024 10:57:52 +0600 Subject: [PATCH 8/8] chore: chore --- .github/workflows/new_issues_label.yml | 1 - .github/workflows/new_pull_request_main_actions.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/new_issues_label.yml b/.github/workflows/new_issues_label.yml index 4e3d3d7..58890cc 100644 --- a/.github/workflows/new_issues_label.yml +++ b/.github/workflows/new_issues_label.yml @@ -14,4 +14,3 @@ jobs: uses: surfstudio/flutter-ci-workflows/.github/workflows/new_issues_label.yml@main secrets: 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 0bbf1ca..e33b93a 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.ACCESS_TOKEN_FOR_SURFGEAR }} \ No newline at end of file + SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }}