Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ci): add epic/* release workflow and rename master to trunk #2895

Merged
merged 9 commits into from
Feb 1, 2024

Conversation

dkoo
Copy link
Contributor

@dkoo dkoo commented Jan 30, 2024

All Submissions:

Changes proposed in this Pull Request:

  1. Adds a new epic/* release workflow for creating release builds that we can use for beta testing and other QA purposes. This workflow is similar to alpha and hotfix/* workflows, but kind of in between them.
  2. Renames the master branch to trunk.

Note: This branch contains a temporary dev dependency pointing to a dev version of newspack-scripts. This will need to be updated once the corresponding change in that repository is merged and released.
Note 2: Because of the changes to the default branch name in this PR, this is based off of the trunk branch (which is currently a direct copy of master). Once all Newspack repositories have similar changes in place, we should be able to simply update the default branches for each repo to trunk in settings.

Screenshot 2024-01-30 at 2 22 11 PM

How to test the changes in this Pull Request:

  1. Check out this branch and run npm ci --legacy-peer-deps.
  2. Create a new branch off of this branch and name it something starting with epic/.
  3. Create a second branch off of that branch and make a change with a feat: or fix: commit prefix.
  4. Merge the second branch into the epic branch without squashing. You can do this via PR or directly in Git and push to the epic branch—both should have the same result.
  5. Confirm that a new release is tagged in the releases page with your epic branch, and that the .zip attached to the release contains the change you made in step 3.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@dkoo dkoo added the [Type] Infrastructure Work for the build pipeline or CI infrastructure label Jan 30, 2024
@dkoo dkoo self-assigned this Jan 30, 2024
@dkoo dkoo marked this pull request as ready for review January 30, 2024 21:24
@dkoo dkoo requested a review from a team as a code owner January 30, 2024 21:24
@dkoo dkoo added the [Status] Needs Review The issue or pull request needs to be reviewed label Jan 30, 2024
Copy link
Member

@adekbadek adekbadek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

tests/sql/newspacktestdata.sql Show resolved Hide resolved
@github-actions github-actions bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Jan 31, 2024
@dkoo
Copy link
Contributor Author

dkoo commented Jan 31, 2024

Thanks, @adekbadek! Will hold on merging until changes from Automattic/newspack-scripts#189 are available in a proper release package.

laurelfulford and others added 4 commits January 31, 2024 11:41
…d orders (#2886)

* fix(ras): only sync spend total and last payment amounts for completed orders

* fix: no need to manually add last order amount to total

* fix: logic for updating upon subscription status change

* fix: apply ex- status only for cancelled or expired subs

* refactor: syntax fixes
@matticbot
Copy link
Contributor

🎉 This PR is included in version 3.0.0-epic-ras-acc.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Feb 8, 2024
# [3.1.0-alpha.1](v3.0.3...v3.1.0-alpha.1) (2024-02-08)

### Bug Fixes

* **engagement-wizard:** handle error when retrieving subscription lists ([e85c108](e85c108))
* **ras:** only sync spend total and last payment amounts for completed orders ([#2886](#2886)) ([68aaf39](68aaf39))
* redirect to origin from magic link ([9f41947](9f41947))
* typescript errors ([dc27973](dc27973))
* TypeScript usage; add to CI ([#2884](#2884)) ([6f5e7a6](6f5e7a6))
* update newsletter scroll appearance in Sign Up modal ([#2897](#2897)) ([496723a](496723a))

### Features

* **ci:** add epic/* release workflow and rename `master` to `trunk` ([#2895](#2895)) ([ea02075](ea02075)), closes [#2897](#2897) [#2886](#2886)
* **reader-revenue:** make NYP and Stripe Gateway optional ([#2866](#2866)) ([fcfa88c](fcfa88c))
* remove new tab default on image credits ([#2880](#2880)) ([3c996b1](3c996b1))
* **wc:** override cart, checkout, and my-account page templates ([#2893](#2893)) ([68b1836](68b1836))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 3.1.0-alpha.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@matticbot
Copy link
Contributor

🎉 This PR is included in version 3.1.0-epic-ras-acc.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Feb 20, 2024
# [3.1.0](v3.0.5...v3.1.0) (2024-02-20)

### Bug Fixes

* add frequency tab options for donations, even when tiers are disabled ([#2930](#2930)) ([cb7eb7b](cb7eb7b))
* **categories:** fix pager urls ([#2913](#2913)) ([bb7e534](bb7e534))
* **categories:** fix pager urls ([#2913](#2913)) ([c851bb6](c851bb6))
* **engagement-wizard:** handle error when retrieving subscription lists ([e85c108](e85c108))
* **ras:** only sync spend total and last payment amounts for completed orders ([#2886](#2886)) ([68aaf39](68aaf39))
* redirect to origin from magic link ([9f41947](9f41947))
* typescript errors ([dc27973](dc27973))
* TypeScript usage; add to CI ([#2884](#2884)) ([6f5e7a6](6f5e7a6))
* update newsletter scroll appearance in Sign Up modal ([#2897](#2897)) ([496723a](496723a))
* update path to wide template file ([#2918](#2918)) ([fdd6b69](fdd6b69))

### Features

* **ci:** add epic/* release workflow and rename `master` to `trunk` ([#2895](#2895)) ([ea02075](ea02075)), closes [#2897](#2897) [#2886](#2886)
* **reader-revenue:** make NYP and Stripe Gateway optional ([#2866](#2866)) ([fcfa88c](fcfa88c))
* remove new tab default on image credits ([#2880](#2880)) ([3c996b1](3c996b1))
* **wc:** override cart, checkout, and my-account page templates ([#2893](#2893)) ([68b1836](68b1836))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 3.1.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
released on @alpha released on @epic/ras-acc released [Status] Approved The pull request has been reviewed and is ready to merge [Type] Infrastructure Work for the build pipeline or CI infrastructure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants