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.

Sign up for GitHub

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

Jump to bottom

Prepare release script updates #2389

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Prepare release script updates #2389

merged 4 commits into from
Jan 29, 2024

Conversation

jaceklyp
Copy link
Contributor

@jaceklyp jaceklyp commented Jan 25, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/414709148257752/1206127499796440/f
CC: @ayoy

Description:

  • make sure all pushed branches have correctly set upstream
  • "release/x.y.z-changes" are now renamed to "release/x.y.z-build-n"
  • there is no longer a "c" flag - the script recognizes if this is the new version or subsequent build
  • build number gets automatically bumped for subsequent releases
  • the flow is a bit simplified
  • release flow is only triggered when "release/x.y.z.-build-n" is merged into "release/x.y.z"

next steps:

  • refactor hotfix flow

@jaceklyp jaceklyp requested a review from bwaresiak January 25, 2024 18:18
bwaresiak
bwaresiak approved these changes Jan 29, 2024
View reviewed changes
Copy link
Collaborator

@bwaresiak bwaresiak left a comment

Choose a reason for hiding this comment

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

LGTM!

@jaceklyp jaceklyp merged commit 4204ddb into main Jan 29, 2024
10 checks passed
@jaceklyp jaceklyp deleted the jacek/release-changes branch January 29, 2024 13:03
samsymons added a commit that referenced this pull request Jan 29, 2024
@samsymons
Merge branch 'main' into sam/fix-alpha-build-vpn-embedding
5d0a99a 
* main:
  Fix `site:` queries escaping with iOS 17 SDK (#640) (#2402)
  Prepare release script updates (#2389)
  Adding lastSentDate to broken site report  (#2320)
  Bump submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2382)
  Skip 'Make Release Build' GHA job for Dependabot PRs (#2399)
samsymons added a commit that referenced this pull request Jan 30, 2024
@samsymons
Merge branch 'main' into sam/suppress-noisy-vpn-pixels
99c20b0 
# By dependabot[bot] (1) and others
# Via GitHub
* main:
  Reenable toggle on disallowing vpn (#2404)
  Bump BrowserServicesKit to 103.0.2 (#2393)
  Fix the alpha build VPN extension embed script (#2396)
  Fix `site:` queries escaping with iOS 17 SDK (#640) (#2402)
  Prepare release script updates (#2389)
  Adding lastSentDate to broken site report  (#2320)
  Bump submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2382)
  Skip 'Make Release Build' GHA job for Dependabot PRs (#2399)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwaresiak bwaresiak bwaresiak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jaceklyp @bwaresiak