Skip to content

Commit

Permalink
random fixes to make jtreg->make->bash chain work under msys2
Browse files Browse the repository at this point in the history
  • Loading branch information
judovana committed Mar 8, 2024
1 parent be00f55 commit 041620c
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,45 +131,45 @@ jobs:
with:
path: "test.*.tar.gz"

test-windows-msys2:
name: "Windows-msys2 Jtreg"
runs-on: "windows-latest"
strategy:
fail-fast: false
matrix:
jdkconf:
- JDK 8
- JDK 11
- JDK 17
- JDK 21
include:
- jdkconf: JDK 8
jdkver: "8"
- jdkconf: JDK 11
jdkver: "11"
- jdkconf: JDK 17
jdkver: "17"
- jdkconf: JDK 21
jdkver: "21"
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.jdkver}}
- uses: msys2/setup-msys2@v2
with:
update: true
install: wget tar make
- name: Prepare env
shell: msys2 {0}
run: ./run.sh "${JAVA_HOME}"
- name: Upload results
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
path: "test.*.tar.gz"
# test-windows-msys2:
# name: "Windows-msys2 Jtreg"
# runs-on: "windows-latest"
# strategy:
# fail-fast: false
# matrix:
# jdkconf:
# - JDK 8
# - JDK 11
# - JDK 17
# - JDK 21
# include:
# - jdkconf: JDK 8
# jdkver: "8"
# - jdkconf: JDK 11
# jdkver: "11"
# - jdkconf: JDK 17
# jdkver: "17"
# - jdkconf: JDK 21
# jdkver: "21"
# steps:
# - uses: actions/checkout@v3
# - name: Set up JDK
# uses: actions/setup-java@v3
# with:
# distribution: 'temurin'
# java-version: ${{ matrix.jdkver}}
# - uses: msys2/setup-msys2@v2
# with:
# update: true
# install: wget tar make
# - name: Prepare env
# shell: msys2 {0}
# run: PATH="/usr/bin:$PATH" BASH_EXECUTABLE=/usr/bin/bash /usr/bin/bash ./run.sh "${JAVA_HOME}"
# - name: Upload results
# if: ${{ always() }}
# uses: actions/upload-artifact@v3
# with:
# path: "test.*.tar.gz"

test-linux-SSLContextInfo-SSLSocketInfo-ssl-tests:
name: "Linux SSLContextInfo SSLSocketInfo ssl-tests"
Expand Down

0 comments on commit 041620c

Please sign in to comment.