Skip to content

Commit

Permalink
Merge pull request #97 from surfstudio/SNP-903_fix_and_update_CI
Browse files Browse the repository at this point in the history
chore(SNP-903): Fix and update CI, add new templates, update FVM
  • Loading branch information
martynov-alex authored Mar 4, 2024
2 parents d14308b + 7daa003 commit f15c4a4
Show file tree
Hide file tree
Showing 17 changed files with 92 additions and 147 deletions.
4 changes: 0 additions & 4 deletions .fvm/fvm_config.json

This file was deleted.

3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.10.0"
}
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
---
name: Bug report
about: Something is wrong with Flutter Bottom Sheet.
about: Something is wrong.
title: "[BUG] "
labels: bug
---

<!--
Thank you for contributing to our project!
This template is only for bugfix reports, otherwise please use another template.
-->
## Expected behavior
<!--Tell us what should happen-->

Expand Down Expand Up @@ -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.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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.
14 changes: 5 additions & 9 deletions .github/ISSUE_TEMPLATE/documentation_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@
name: Documentation update
about: Fixing a problem or improve in an existing docs page.
labels: documentation
assignees: MbIXjkee
---

<!--
Thank you for contributing to our project!
This template is only for documentation update reports, otherwise please use another template.
-->
## Specify package name
<!--Write the name of the package where you have problems-->

## Describe what scenario you think is uncovered by the existing examples / articles

A clear and concise description of the problem that you want explained.
<!--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.
<!--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.
<!--Add any other context or screenshots about the documentation request here.-->
20 changes: 9 additions & 11 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -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
---

<!--
Thank you for contributing to our project!
This template is only for feature requests, otherwise please use another template.
Provide thoughtful commentary *and code samples* on what this feature means for your product. What will it allow you to do that you can't do today? How will it make current work-arounds straightforward? What potential bugs and edge cases does it help to avoid? etc. Please keep it product-centric.
Provide thoughtful commentary *and code samples* on what this feature means for your product. What will it allow you to do that you can't do today? How will it make current workarounds straightforward? What potential bugs and edge cases does it help to avoid? etc. Please keep it product-centric.
-->
## Specify package name
<!--Write the name of the package where you have problems-->

## What is the new or updated feature that you are suggesting?

A clear and concise description of what you want to happen.
<!--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.
<!--Is your feature request related to a problem? Please describe a clear and concise description of what the problem is. If you investigate any alternative solutions, please describe.-->

## Additional context

Please provide any other context or screenshots about the feature request here.
<!--Please provide any other context or screenshots about the feature request here.-->
74 changes: 5 additions & 69 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,6 @@
## Related tasks
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#related-tasks
-->
Tap on "Preview" ⤴


## Dependence on other Pull Requests (optional)
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#dependence-on-other-pull-requests-optional
-->

## Background (optional)
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#background-optional
-->

## Changes
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#changes
-->

## Troubles (optional)
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#troubles-optional
-->

## Note (optional)
<!--
For more info https://github.com/surfstudio/flutter-roadmap/blob/main/docs/PULL_REQUEST_TEMPLATE_README.md#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)
10 changes: 2 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE/bug_fix.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
---
name: Bug fix
about: Fixing a problem with Flutter Bottom Sheet.
assignees: MbIXjkee
---

<!--
Thank you for contributing to our project!
Provide a description of your changes below and a general summary in the title.
Please look at the following checklist to ensure that your PR can be accepted quickly:
-->

## 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
Expand Down
10 changes: 1 addition & 9 deletions .github/PULL_REQUEST_TEMPLATE/documentation_update.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
---
name: Documentation update
about: Fixing a problem or improve in an existing docs page.
labels: documentation
assignees: MbIXjkee
---

<!--
Thank you for contributing to our project!
Provide a description of your changes below and a general summary in the title.
Please look at the following checklist to ensure that your PR can be accepted quickly:
-->

## 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
Expand Down
10 changes: 2 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE/new_feature.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
---
name: New feature
labels: enhancement
assignees: MbIXjkee
---

<!--
Thank you for contributing to our project!
Provide a description of your changes below and a general summary in the title.
Please look at the following checklist to ensure that your PR can be accepted quickly:
-->

## 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
Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/new_issue_to_pyrus_task.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/new_issues_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }}
2 changes: 1 addition & 1 deletion .github/workflows/new_pull_request_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/new_pull_request_main_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
SECRET_ISSUES: ${{ secrets.ACCESS_TOKEN_FOR_SURFGEAR }}
18 changes: 9 additions & 9 deletions .github/workflows/publish_to_pub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
.pub-cache/
.pub/
build/
.fvm/flutter_sdk

# FVM
.fvm/

# Android related
**/android/**/gradle-wrapper.jar
Expand Down

0 comments on commit f15c4a4

Please sign in to comment.