Skip to content

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.18 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.18

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

* Create signed git artifacts upon release

* Generate signature for PECL package

* Fix writing release message to file

* Remove unnecessary pip install

* Change image variable usage

* Sign Windows DLLs

* Move composite actions to separate directory

* Extract signing functionality to composite actions

* Add release integrity information

* Use garasign actions from drivers-github-tools

* Add comment explaining cross-os cache

* Remove submodule install for Windows signing job

* Fix name and contents of Windows build artifacts"

* Don't hardcode tag message file name

* Restore original tag message

* Add newline to tag message
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 10, 2024 08:29
@mongodb-php-bot mongodb-php-bot merged commit 54ea78b into master May 10, 2024
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.18-into-master-1715329764884 branch May 10, 2024 08:42
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.

3 participants