Skip to content

Commit e2ff906

Browse files
authored
Merge pull request #9 from sophia-guo/v1
Updates
2 parents 84b7288 + 272e4c8 commit e2ff906

File tree

7 files changed

+165
-186
lines changed

7 files changed

+165
-186
lines changed

.github/workflows/NightlyJDK14BuildAndTest.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/NightlyJDK8BuildAndTest.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/NightlyJDK11BuildAndTest.yml renamed to .github/workflows/nightly.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
2121
###############################################################################
22-
name: "nightly build-openj9 jdk 11"
22+
name: "nightly build-openj9"
2323
on:
2424
schedule:
2525
- cron: '30 21 * * 1-5'
@@ -31,20 +31,19 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
os: [ubuntu-16.04, macos-10.15, windows-2016]
34+
version: [8, 11, 15]
35+
exclude:
36+
# excludes jdk 8 on Mac( not valid), jdk8 on windows( not enabled), jdk11 on windows( issue opened)
37+
- os: macos-10.15
38+
version: 8
39+
- os: windows-2016
40+
version: 8
41+
- os: windows-2016
42+
version: 11 #https://github.com/eclipse/build-openj9/issues/2
3443
steps:
44+
- uses: actions/checkout@v1
3545
- uses: eclipse/build-openj9@v1
3646
id: buildJDK
3747
with:
38-
version: 11
39-
- name: AQA
40-
uses: AdoptOpenJDK/run-aqa@v1
41-
env:
42-
TEST_JDK_HOME: ${{ steps.buildJDK.outputs.BuildJDKDir }}
43-
with:
44-
build_list: 'functional'
45-
target: '_sanity'
46-
- uses: actions/upload-artifact@v2
47-
if: failure()
48-
with:
49-
name: test_output
50-
path: ./**/test_output_*/
48+
version: ${{ matrix.version }}
49+
- run: ${{ steps.buildJDK.outputs.BuildJDKDir }}/bin/java -version

.github/workflows/test.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ inputs:
3131
required: false
3232
default: false
3333
outputs:
34-
BuildJDKDir: # build jdk images directory
34+
BuildJDKDir:
35+
description: 'build jdk images directory'
3536
runs:
3637
using: 'node12'
3738
main: 'dist/index.js'

0 commit comments

Comments
 (0)