Skip to content

Commit 9adfbc0

Browse files
dependabot[bot]reta
authored andcommitted
Bump peter-evans/create-pull-request from 6 to 7 (#15863)
* Bump peter-evans/create-pull-request from 6 to 7 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](peter-evans/create-pull-request@v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit e688d39)
1 parent 58fc68e commit 9adfbc0

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/version.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
sed -i "s/CURRENT = $CURRENT_VERSION_UNDERSCORE;/CURRENT = $NEXT_VERSION_UNDERSCORE;/g" libs/core/src/main/java/org/opensearch/Version.java
6060
6161
- name: Create Pull Request
62-
uses: peter-evans/create-pull-request@v6
62+
uses: peter-evans/create-pull-request@v7
6363
with:
6464
token: ${{ steps.github_app_token.outputs.token }}
6565
base: ${{ env.BASE }}
@@ -85,8 +85,14 @@ jobs:
8585
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
8686
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
8787
88+
<<<<<<< HEAD
8889
- name: Create Pull Request
8990
uses: peter-evans/create-pull-request@v6
91+
=======
92+
- name: Create PR for BASE_X
93+
id: base_x_pr
94+
uses: peter-evans/create-pull-request@v7
95+
>>>>>>> e688d39a5d4 (Bump peter-evans/create-pull-request from 6 to 7 (#15863))
9096
with:
9197
token: ${{ steps.github_app_token.outputs.token }}
9298
base: ${{ env.BASE_X }}
@@ -113,8 +119,14 @@ jobs:
113119
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
114120
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
115121
122+
<<<<<<< HEAD
116123
- name: Create Pull Request
117124
uses: peter-evans/create-pull-request@v6
125+
=======
126+
- name: Create PR for main
127+
id: main_pr
128+
uses: peter-evans/create-pull-request@v7
129+
>>>>>>> e688d39a5d4 (Bump peter-evans/create-pull-request from 6 to 7 (#15863))
118130
with:
119131
token: ${{ steps.github_app_token.outputs.token }}
120132
base: main

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1010
### Dependencies
1111
- Bump `com.azure:azure-identity` from 1.13.0 to 1.13.2 ([#15578](https://github.com/opensearch-project/OpenSearch/pull/15578))
1212
- Bump `protobuf` from 3.22.3 to 3.25.4 ([#15684](https://github.com/opensearch-project/OpenSearch/pull/15684))
13+
- Bump `peter-evans/create-pull-request` from 6 to 7 ([#15863](https://github.com/opensearch-project/OpenSearch/pull/15863))
1314

1415
### Changed
1516

0 commit comments

Comments
 (0)