diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8eb5755..a23ba81 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,8 +1,8 @@
name: "build-test"
on: # rebuild any PRs and main branch changes
push:
- branches:
- - feature
+ branches-ignore:
+ - '**'
jobs:
build: # make sure build/ci work properly
diff --git a/.github/workflows/testcustom.yml b/.github/workflows/testcustom.yml
new file mode 100644
index 0000000..378fcc8
--- /dev/null
+++ b/.github/workflows/testcustom.yml
@@ -0,0 +1,25 @@
+name: "build-test"
+on: # rebuild any PRs and main branch changes
+ push:
+
+jobs:
+ build: # make sure build/ci work properly
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-latest, macos-latest]
+ steps:
+ - uses: actions/checkout@v1
+ - uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '11'
+ targets: 'JDK_11'
+ - name: AQA
+ uses: ./
+ with:
+ version: '11'
+ jdksource: 'install-jdk'
+ build_list: 'openjdk'
+ target: '_jdk_custom'
+ custom_target: 'test/jdk/java/math/BigInteger/BigIntegerTest.java'
diff --git a/.github/workflows/testexample.yml b/.github/workflows/testexample.yml
new file mode 100644
index 0000000..5f4ca00
--- /dev/null
+++ b/.github/workflows/testexample.yml
@@ -0,0 +1,24 @@
+name: "build-test"
+on: # rebuild any PRs and main branch changes
+ push:
+
+jobs:
+ build: # make sure build/ci work properly
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-latest] #[ubuntu-latest, macos-latest]
+ steps:
+ - uses: actions/checkout@v1
+ - uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '11'
+ targets: 'JDK_11'
+ - name: AQA
+ uses: ./
+ with:
+ version: '11'
+ jdksource: 'install-jdk'
+ build_list: 'openjdk'
+ target: '_jdk_custom'
diff --git a/.project b/.project
new file mode 100644
index 0000000..c4660bd
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+
+
+ run-aqa
+
+
+
+
+
+
+
+
diff --git a/action.yml b/action.yml
index 478b3a9..2e2bafe 100644
--- a/action.yml
+++ b/action.yml
@@ -13,7 +13,10 @@ inputs:
default: 'openjdk'
target: # test
description:
- default: '_jdk_custom'
+ default: '_jdk_math'
+ custom_target:
+ description:
+ required: false
runs:
using: 'node12'
main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
index 39565b4..c535ee3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2890,6 +2890,7 @@ function run() {
const version = core.getInput('version', { required: false });
const buildList = core.getInput('build_list', { required: false });
const target = core.getInput('target', { required: false });
+ const customTarget = core.getInput('custom_target', { required: false });
// let arch = core.getInput("architecture", { required: false })
if (jdksource !== 'upstream' &&
jdksource !== 'github-hosted' &&
@@ -2906,7 +2907,7 @@ function run() {
if (jdksource !== 'upstream' && version.length === 0) {
core.setFailed('Please provide jdkversion if jdksource is github-hosted installed or AdoptOpenJKD/install-jdk installed.');
}
- yield runaqa.runaqaTest(version, jdksource, buildList, target);
+ yield runaqa.runaqaTest(version, jdksource, buildList, target, customTarget);
}
catch (error) {
core.setFailed(error.message);
@@ -3237,9 +3238,13 @@ const io = __importStar(__webpack_require__(1));
const tc = __importStar(__webpack_require__(533));
const path = __importStar(__webpack_require__(622));
const isWindows = process.platform === 'win32';
-function runaqaTest(version, jdksource, buildList, target) {
+function runaqaTest(version, jdksource, buildList, target, customTarget) {
return __awaiter(this, void 0, void 0, function* () {
yield installDependency();
+ let customOption = '';
+ if (target.includes('custom') && customTarget !== '') {
+ customOption = `${target.toUpperCase()}_TARGET=${customTarget}`;
+ }
process.env.BUILD_LIST = buildList;
if (!('TEST_JDK_HOME' in process.env))
process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource);
@@ -3260,7 +3265,7 @@ function runaqaTest(version, jdksource, buildList, target) {
process.chdir('TKG');
try {
yield exec.exec('make compile');
- yield exec.exec('make', [`${target}`], options);
+ yield exec.exec('make', [`${target} ${customOption}`], options);
}
catch (error) {
core.setFailed(error.message);
diff --git a/src/aqa.ts b/src/aqa.ts
index 9c4b375..ec83bc4 100644
--- a/src/aqa.ts
+++ b/src/aqa.ts
@@ -7,6 +7,7 @@ async function run(): Promise {
const version = core.getInput('version', {required: false})
const buildList = core.getInput('build_list', {required: false})
const target = core.getInput('target', {required: false})
+ const customTarget = core.getInput('custom_target',{required: false})
// let arch = core.getInput("architecture", { required: false })
if (
jdksource !== 'upstream' &&
@@ -35,7 +36,7 @@ async function run(): Promise {
)
}
- await runaqa.runaqaTest(version, jdksource, buildList, target)
+ await runaqa.runaqaTest(version, jdksource, buildList, target, customTarget)
} catch (error) {
core.setFailed(error.message)
}
diff --git a/src/runaqa.ts b/src/runaqa.ts
index b78200f..bef8794 100644
--- a/src/runaqa.ts
+++ b/src/runaqa.ts
@@ -11,9 +11,14 @@ export async function runaqaTest(
version: string,
jdksource: string,
buildList: string,
- target: string
+ target: string,
+ customTarget: string
): Promise {
await installDependency()
+ let customOption = ''
+ if (target.includes('custom') && customTarget !== '') {
+ customOption = `${target.toUpperCase()}_TARGET=${customTarget}`
+ }
process.env.BUILD_LIST = buildList
if (!('TEST_JDK_HOME' in process.env)) process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource)
@@ -36,7 +41,7 @@ export async function runaqaTest(
process.chdir('TKG')
try {
await exec.exec('make compile')
- await exec.exec('make', [`${target}`], options)
+ await exec.exec('make', [`${target} ${customOption}`], options)
} catch (error) {
core.setFailed(error.message)
}