diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 5aa58dcc..11a25942 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -26,84 +26,100 @@ jobs: - 20 - 21 distribution: - - zulu - - temurin - - liberica - - dragonwell - corretto + - dragonwell + - liberica - semeru + - temurin + - zulu os: - 'macos-latest' - 'ubuntu-latest' exclude: - - os: macos-latest - distribution: dragonwell - - os: macos-latest - distribution: semeru - - os: ubuntu-latest - version: 8 + - distribution: dragonwell + os: macos-latest + - distribution: semeru + os: macos-latest + - version: 8 distribution: semeru - - os: macos-latest - version: 8 + os: ubuntu-latest + - version: 8 distribution: temurin - - os: macos-latest - version: 13 + os: macos-latest + - version: 11 + distribution: semeru + - version: 13 distribution: temurin - - os: macos-latest - version: 13 + - version: 13 distribution: liberica - - os: macos-latest - version: 13 + os: macos-latest + - version: 13 + distribution: dragonwell + - version: 13 distribution: corretto - - os: macos-latest - version: 15 + - version: 13 + distribution: semeru + - version: 15 distribution: temurin - - os: macos-latest - version: 15 + - version: 15 distribution: corretto - - os: macos-latest - version: 16 + os: macos-latest + - version: 15 + distribution: dargonwell + os: ubuntu-latest + - version: 15 + distribution: semeru + - version: 16 distribution: temurin - - os: macos-latest - version: 16 + os: macos-latest + - version: 16 distribution: corretto + os: macos-latest + - version: 16 + distribution: dragonwell + - version: 18 + distribution: dragonwell + - version: 19 + distribution: dragonwell + - version: 20 + distribution: dragonwell include: - - os: ubuntu-latest - version: 9 + - version: 9 distribution: zulu - - os: ubuntu-latest - version: 21 + os: ubuntu-latest + - version: 23 + distribution: corretto + os: ubuntu-latest + - version: 22 + distribution: corretto + os: ubuntu-latest + - version: 21 distribution: microsoft - - os: ubuntu-latest - version: 17 + os: ubuntu-latest + - version: 17 distribution: microsoft - - os: ubuntu-latest - version: 16 + os: ubuntu-latest + - version: 16 distribution: microsoft - - os: ubuntu-latest - version: 11 + os: ubuntu-latest + - version: 11 distribution: microsoft - - os: ubuntu-latest - version: 21 + os: ubuntu-latest + - version: 21 distribution: oracle - - os: ubuntu-latest - version: 20 + os: ubuntu-latest + - version: 20 distribution: oracle - - os: ubuntu-latest - version: 19 + os: ubuntu-latest + - version: 19 distribution: oracle - - os: ubuntu-latest - version: 18 + os: ubuntu-latest + - version: 18 distribution: oracle - - os: ubuntu-latest - version: 17 + os: ubuntu-latest + - version: 17 distribution: oracle - # - os: windows-latest - # version: 21 - # distribution: temurin - # - os: macos-latest - # version: 21 - # distribution: temurin + os: ubuntu-latest runs-on: ${{ matrix.os }} @@ -125,10 +141,10 @@ jobs: - name: Run tests (in parallel) if: ${{ matrix.version != 21 || matrix.os != 'ubuntu-latest' }} - run: make ja_test_auto + run: make ja_test_auto IS_TARGET=false - name: Upload code coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} flags: Java diff --git a/docs/Makefile b/docs/Makefile index 8352ec29..b85cde3a 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -30,8 +30,9 @@ clean: @rm -rf _build _static/dist || echo .PHONY: dependencies +dependencies: SHELL := bash dependencies: - @$(PIP) install -r requirements.txt -r ../c/requirements.txt -r ../python/requirements.txt --upgrade $(USER_FLAG) $(PROXY_ARG) + @$(PIP) install --requirement={.,../{c,cplusplus,python}}/requirements.txt --upgrade $(USER_FLAG) $(PROXY_ARG) @npm install -g jsdoc _static/dist/bundle.js: diff --git a/java/Makefile b/java/Makefile index 0247780a..396b2d21 100644 --- a/java/Makefile +++ b/java/Makefile @@ -1,7 +1,7 @@ MVN?=mvn MVN_FLAGS?= -e BLUE=\033[0;34m -NC=\033[0m # No Color +NC=\033[0m # No Color .PHONY: help help: diff --git a/java/src/test/java/EulerTest.java b/java/src/test/java/EulerTest.java index 59c9f48e..50414735 100644 --- a/java/src/test/java/EulerTest.java +++ b/java/src/test/java/EulerTest.java @@ -45,7 +45,7 @@ void eulerTestProblem(Class problemClass, boolean isSlow, Object expected) th Object result = answerMethod.invoke(instance); long elapsedTime = System.nanoTime() - startTime; Assertions.assertEquals(expected, result); - if (!isSlow) { + if (!isSlow && System.getenv("IS_TARGET") != "false") { Assertions.assertTrue(elapsedTime <= ONE_MINUTE_NS, "Test took too long"); } }