Skip to content

Commit 8a99beb

Browse files
authored
Merge branch 'main' into prepare-preview-builds-action
2 parents 4ae7a7f + fb0c976 commit 8a99beb

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/merge-approved-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- name: Merge approved PR
41-
uses: ./.github/actions/merge-approved-pr
41+
uses: MetaMask/github-tools/.github/actions/merge-approved-pr@v1
4242
with:
4343
pr-number: ${{ inputs.pr-number }}
4444
required-base-branch: ${{ inputs.required-base-branch }}

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.7.1]
11+
12+
### Fixed
13+
14+
- fix: resolve merge-approved-pr action path for cross-repo workflow calls ([#224](https://github.com/MetaMask/github-tools/pull/224))
15+
1016
## [1.7.0]
1117

1218
### Changed
@@ -132,7 +138,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
132138
- Some inputs were renamed for consistency across actions.
133139
- Bump `actions/checkout` and `actions/setup-node` to `v6` ([#173](https://github.com/MetaMask/github-tools/pull/173))
134140

135-
[Unreleased]: https://github.com/MetaMask/github-tools/compare/v1.7.0...HEAD
141+
[Unreleased]: https://github.com/MetaMask/github-tools/compare/v1.7.1...HEAD
142+
[1.7.1]: https://github.com/MetaMask/github-tools/compare/v1.7.0...v1.7.1
136143
[1.7.0]: https://github.com/MetaMask/github-tools/compare/v1.6.0...v1.7.0
137144
[1.6.0]: https://github.com/MetaMask/github-tools/compare/v1.5.0...v1.6.0
138145
[1.5.0]: https://github.com/MetaMask/github-tools/compare/v1.4.4...v1.5.0

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/github-tools",
3-
"version": "1.7.0",
3+
"version": "1.7.1",
44
"private": true,
55
"description": "Tools for interacting with the GitHub API to do metrics gathering",
66
"repository": {

0 commit comments

Comments
 (0)