Skip to content

Commit 2b2bf3a

Browse files
andrlosandrlos
authored
Aqa based jre rework (#14)
* ditching internal downloading of jdk trying to remove various code crutches that used to be necessary, but should not be needed anymore * updating yaml file to account for the changes * v3 github actions deprecated * moving run-folder-as-test to be a module instead of hardcoded clone * trying local determination of the system and cygpath classpath accordingly
1 parent 2a88517 commit 2b2bf3a

File tree

4 files changed

+82
-146
lines changed

4 files changed

+82
-146
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,26 @@ jobs:
3131
- jdkconf: JDK 17
3232
jdkver: "17"
3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
35+
with:
36+
submodules: true
37+
3538
- name: Set up JDK
36-
uses: actions/setup-java@v3
39+
uses: actions/setup-java@v4
3740
with:
3841
distribution: 'temurin'
3942
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
4043
- name: Run
4144
run: |
42-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk"
45+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
4346
./testHeadlessComponents.sh
4447
- name: Pack results
4548
if: ${{ always() }}
4649
run: |
4750
tar -cf "results-linux-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
4851
- name: Upload results
4952
if: ${{ always() }}
50-
uses: actions/upload-artifact@v3
53+
uses: actions/upload-artifact@v4
5154
with:
5255
path: "results-linux-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
5356
continue-on-error: true
@@ -71,23 +74,26 @@ jobs:
7174
- jdkconf: JDK 17
7275
jdkver: "17"
7376
steps:
74-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
78+
with:
79+
submodules: true
80+
7581
- name: Set up JDK
76-
uses: actions/setup-java@v3
82+
uses: actions/setup-java@v4
7783
with:
7884
distribution: 'temurin'
7985
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
8086
- name: Run
8187
run: |
82-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
88+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
8389
./testHeadlessComponents.sh
8490
- name: Pack results
8591
if: ${{ always() }}
8692
run: |
8793
tar -cf "results-linux-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
8894
- name: Upload results
8995
if: ${{ always() }}
90-
uses: actions/upload-artifact@v3
96+
uses: actions/upload-artifact@v4
9197
with:
9298
path: "results-linux-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
9399
continue-on-error: true
@@ -111,22 +117,25 @@ jobs:
111117
- jdkconf: JDK 17
112118
jdkver: "17"
113119
steps:
114-
- uses: actions/checkout@v3
120+
- uses: actions/checkout@v4
121+
with:
122+
submodules: true
123+
115124
- uses: msys2/setup-msys2@v2
116125
with:
117126
update: true
118127
install: wget tar git unzip
119128

120-
- uses: actions/checkout@v3
129+
- uses: actions/checkout@v4
121130
- name: Set up JDK
122-
uses: actions/setup-java@v3
131+
uses: actions/setup-java@v4
123132
with:
124133
distribution: 'temurin'
125134
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
126135
- name: Run
127136
shell: msys2 {0}
128137
run: |
129-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
138+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
130139
./testHeadlessComponents.sh
131140
- name: Pack results
132141
if: ${{ always() }}
@@ -135,7 +144,7 @@ jobs:
135144
tar -cf "results-windows-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
136145
- name: Upload results
137146
if: ${{ always() }}
138-
uses: actions/upload-artifact@v3
147+
uses: actions/upload-artifact@v4
139148
with:
140149
path: "results-windows-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
141150
continue-on-error: true
@@ -159,22 +168,25 @@ jobs:
159168
- jdkconf: JDK 17
160169
jdkver: "17"
161170
steps:
162-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
172+
with:
173+
submodules: true
174+
163175
- uses: msys2/setup-msys2@v2
164176
with:
165177
update: true
166178
install: wget tar git unzip
167179

168-
- uses: actions/checkout@v3
180+
- uses: actions/checkout@v4
169181
- name: Set up JDK
170-
uses: actions/setup-java@v3
182+
uses: actions/setup-java@v4
171183
with:
172184
distribution: 'temurin'
173185
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
174186
- name: Run
175187
shell: msys2 {0}
176188
run: |
177-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
189+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
178190
./testHeadlessComponents.sh
179191
- name: Pack results
180192
if: ${{ always() }}
@@ -183,7 +195,7 @@ jobs:
183195
tar -cf "results-windows-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
184196
- name: Upload results
185197
if: ${{ always() }}
186-
uses: actions/upload-artifact@v3
198+
uses: actions/upload-artifact@v4
187199
with:
188200
path: "results-windows-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
189201
continue-on-error: true
@@ -200,46 +212,41 @@ jobs:
200212
- JDK 17
201213
- JDK Latest
202214
include:
203-
- jdkconf: JDK 8
204-
jdkver: "8"
205215
- jdkconf: JDK 11
206216
jdkver: "11"
207217
- jdkconf: JDK 17
208218
jdkver: "17"
209219
steps:
210-
- uses: actions/checkout@v3
211-
- name: Install Homebrew
220+
- name: Checkout
221+
uses: actions/checkout@v4
222+
with:
223+
submodules: true
224+
225+
- name: Install Bash with brew
212226
run: |
213-
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
214-
echo 'eval $(/usr/local/bin/brew shellenv)' >> $HOME/.zprofile
215-
eval $(/usr/local/bin/brew shellenv)
216-
217-
- name: Install Bash with Homebrew
218-
run: brew install bash
219-
220-
- name: Update Shell Configuration
221-
run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
222-
223-
- name: Verify Bash Version
224-
run: /usr/local/bin/bash --version
227+
brew install bash
228+
echo "/usr/local/bin/bash" >> $GITHUB_PATH
229+
230+
- name: Check Bash version
231+
run: bash --version
225232

226233
- name: Set up JDK
227-
uses: actions/setup-java@v3
234+
uses: actions/setup-java@v4
228235
with:
229236
distribution: 'temurin'
230237
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
231238
- name: Run
232239
run: |
233-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace
234-
/usr/local/bin/bash testHeadlessComponents.sh
240+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
241+
bash testHeadlessComponents.sh
235242
- name: Pack results
236243
if: ${{ always() }}
237244
run: |
238245
export WORKSPACE=/Users/runner/workspace
239246
tar -cf "results-macos-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
240247
- name: Upload results
241248
if: ${{ always() }}
242-
uses: actions/upload-artifact@v3
249+
uses: actions/upload-artifact@v4
243250
with:
244251
path: "results-macos-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
245252
continue-on-error: true
@@ -258,46 +265,41 @@ jobs:
258265
- JDK 17
259266
- JDK Latest
260267
include:
261-
- jdkconf: JDK 8
262-
jdkver: "8"
263268
- jdkconf: JDK 11
264269
jdkver: "11"
265270
- jdkconf: JDK 17
266271
jdkver: "17"
267272
steps:
268-
- uses: actions/checkout@v3
269-
- name: Install Homebrew
273+
- name: Checkout
274+
uses: actions/checkout@v4
275+
with:
276+
submodules: true
277+
278+
- name: Install Bash with brew
270279
run: |
271-
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
272-
echo 'eval $(/usr/local/bin/brew shellenv)' >> $HOME/.zprofile
273-
eval $(/usr/local/bin/brew shellenv)
274-
275-
- name: Install Bash with Homebrew
276-
run: brew install bash
277-
278-
- name: Update Shell Configuration
279-
run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
280-
281-
- name: Verify Bash Version
282-
run: /usr/local/bin/bash --version
280+
brew install bash
281+
echo "/usr/local/bin/bash" >> $GITHUB_PATH
283282
283+
- name: Check Bash version
284+
run: bash --version
285+
284286
- name: Set up JDK
285-
uses: actions/setup-java@v3
287+
uses: actions/setup-java@v4
286288
with:
287289
distribution: 'temurin'
288290
java-version: ${{ matrix.jdkver || env.jdkver_latest }}
289291
- name: Run
290292
run: |
291-
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" WORKSPACE=/Users/runner/workspace
292-
/usr/local/bin/bash testHeadlessComponents.sh
293+
export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" TEST_JDK_HOME="${JAVA_HOME}"
294+
bash testHeadlessComponents.sh
293295
- name: Pack results
294296
if: ${{ always() }}
295297
run: |
296298
export WORKSPACE=/Users/runner/workspace
297299
tar -cf "results-macos-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
298300
- name: Upload results
299301
if: ${{ always() }}
300-
uses: actions/upload-artifact@v3
302+
uses: actions/upload-artifact@v4
301303
with:
302304
path: "results-macos-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
303305
continue-on-error: true

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "RFaT"]
2+
path = RFaT
3+
url = https://github.com/rh-openjdk/run-folder-as-tests.git

‎RFaT‎

Submodule RFaT added at 80b2151

0 commit comments

Comments
 (0)