Skip to content

Commit bce580d

Browse files
committed
Updates
1 parent 92bb897 commit bce580d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ Thank you for contributing to this repository! :bow:
88
- `feature/` (i.e., enhancements)
99
- `hotfix/` (i.e., bug fixes)
1010
2. Make changes
11-
3. Create a PR to the appropriate branch (`release/v*`/`main`)
11+
3. Create a PR to the `main` branch
12+
13+
### Release
14+
Whenever a release is published, a PR should be made from `main` to the appropriate `release/v*` branch.

.github/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Recommended rules for the `main` and `release/v*` branches:
2424
### Workflows
2525

2626
- All of the workflows here use the [Ensure SHA Pinned Actions](https://github.com/marketplace/actions/ensure-sha-pinned-actions) action to ensure security hardening.
27-
- The [Get the Flutter Version Environment](https://github.com/marketplace/actions/get-the-flutter-version-environment) action requires that the [`pubspec.yaml`](pubspec.yaml) file contains an `environment:flutter:` key, which is used for installing Flutter with the correct version.
27+
- The [Get the Flutter Version Environment](https://github.com/marketplace/actions/get-the-flutter-version-environment) action requires that the [`pubspec.yaml`](../pubspec.yaml#L22) file contains an `environment:flutter:` key, which is used for installing Flutter with the correct version.
2828

2929
#### Continuous Integration
3030
[![CI](https://github.com/zgosalvez/github-actions-flutter-workflow/workflows/CI/badge.svg)](https://github.com/zgosalvez/github-actions-flutter-workflow/actions?query=workflow%3ACI)
@@ -38,7 +38,7 @@ Also known as CI, Continuous Integration runs Flutter static and dynamic tests o
3838

3939
[`.github/workflows/cdelivery.yml`](workflows/cdelivery.yml)
4040

41-
Also known as CDelivery (not to be mistaken with another CD, i.e., Continuous Deployment), Continuous Delivery drafts a pre-release on *every push* to `main` and `release/v*`. This ensures that the drafted release is created or updated. Manually remove the pre-release mark after it has been deployed and released to the app store.
41+
Also known as CDelivery (not to be mistaken with another CD, i.e., Continuous Deployment), Continuous Delivery drafts a pre-release on *every push* to `main`. For the draft to populate with the release notes, pull requests should be `main` based. Manually remove the pre-release mark after it has been deployed and released to the app store.
4242

4343
[`.github/workflows/pull_request-opened.yml`](workflows/pull_request-opened.yml)
4444

.github/workflows/cdelivery.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: CDelivery
22

33
on:
44
push:
5-
branches:
6-
- main
7-
- release/v*
5+
branches: [ main ]
86

97
jobs:
108
security_hardening:

0 commit comments

Comments
 (0)