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

Merge v1.19 into master #1585

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.19 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.19

Then, push the temporary branch to upate the pull request.

* Run packaging manually from release workflow

* Run static analysis for tag manually from release workflow

* Publish SSDLC assets after release

* Use secure-checkout action to generate token and run checkout

* Use API to generate changelog for PECL package

* Use inputs.version to pass version

* Use bump and tag actions from drivers-github-tools

* Remove build artifacts and require release asset upload to succeed

* Continue publishing SSDLC assets if SBOM download fails

* Extract building Windows Package to reusable workflow

* Remove unnecessary release files

* Apply suggestion from code review

* Let publish job error out when SBOM download fails
@mongodb-php-bot mongodb-php-bot merged commit 77f26f6 into master Jun 13, 2024
87 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.19-into-master-1718292740091 branch June 13, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants