Skip to content

Commit

Permalink
8310259: Pin msys2/setup-msys2 github action to a specific commit
Browse files Browse the repository at this point in the history 
Reviewed-by: cstein, stuefe
  • Loading branch information
@jaikiran
jaikiran committed Jun 17, 2023
1 parent bcc4d36 commit 959a61f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/actions/get-jtreg/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ runs:
- name: 'Build JTReg'
run: |
# Build JTReg and move files to the proper locations
bash make/build.sh --jdk "$(realpath bootjdk/jdk)"
bash make/build.sh --jdk "$JAVA_HOME_17_X64"
mkdir ../installed
mv build/images/jtreg/* ../installed
working-directory: jtreg/src
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/get-msys2/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ runs:
using: composite
steps:
- name: 'Install MSYS2'
uses: msys2/setup-msys2@v2
# use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
with:
install: 'autoconf tar unzip zip make'
path-type: minimal
Expand Down

3 comments on commit 959a61f

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@jaikiran
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21

@openjdk
Copy link

@openjdk openjdk bot commented on 959a61f Jun 19, 2023

Choose a reason for hiding this comment

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

@jaikiran Could not automatically backport 959a61fd to openjdk/jdk21 due to conflicts in the following files:

  • .github/actions/get-jtreg/action.yml

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b jaikiran-backport-959a61fd

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 959a61fdd483c9523764b9ba0972f59ca06db0ee

# Backport the commit
$ git cherry-pick --no-commit 959a61fdd483c9523764b9ba0972f59ca06db0ee
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 959a61fdd483c9523764b9ba0972f59ca06db0ee'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21 with the title Backport 959a61fdd483c9523764b9ba0972f59ca06db0ee.

Please sign in to comment.