8310259: Pin msys2/setup-msys2 github action to a specific commit

8309934: Update GitHub Actions to use JDK 17 for building jtreg Reviewed-by: cstein, clanger Backport-of: 959a61fdd483c9523764b9ba0972f59ca06db0ee
openjdk · Jun 20, 2023 · 08965e6 · 08965e6 · openjdk-notifier · Jun 20, 2023
1 parent e0d3706
commit 08965e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/actions/get-jtreg/action.yml b/.github/actions/get-jtreg/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ runs:
     - name: 'Build JTReg'
       run: |
         # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_11_X64"
+        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
         mkdir ../installed
         mv build/images/jtreg/* ../installed
       working-directory: jtreg/src

diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml
@@ -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