From a1c6c9c8677803c9f4bd31e0f15ac0844258f955 Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Fri, 3 May 2024 18:59:31 +0530 Subject: [PATCH 1/2] Updated advanced-usage.md (#622) * Update advanced-usage.md * Update advanced-usage.md * Update advanced-usage.md * Update README.md * Update advanced-usage.md --- README.md | 4 ++-- docs/advanced-usage.md | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a3ac397..7702e6f 100644 --- a/README.md +++ b/README.md @@ -91,8 +91,8 @@ steps: #### Supported version syntax The `java-version` input supports an exact version or a version range using [SemVer](https://semver.org/) notation: - major versions: `8`, `11`, `16`, `17`, `21` -- more specific versions: `17.0`, `11.0`, `11.0.4`, `8.0.232`, `8.0.282+8` -- early access (EA) versions: `15-ea`, `15.0.0-ea`, `15.0.0-ea.2`, `15.0.0+2-ea` +- more specific versions: `8.0.282+8`, `8.0.232`, `11.0`, `11.0.4`, `17.0` +- early access (EA) versions: `15-ea`, `15.0.0-ea` #### Supported distributions Currently, the following distributions are supported: diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index c3cf42d..3503748 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -526,19 +526,19 @@ steps: ``` ## Java version file -If the `java-version-file` input is specified, the action will extract the version from the file and install it. - -Supported files are .java-version and .tool-versions. -In .java-version file, only the version should be specified, e.g., 17.0.7. -In .tool-versions file, java version should be preceded by the java keyword, e.g., java 17.0.7. -.java-version recognizes all variants of the version description according to [jenv](https://github.com/jenv/jenv) and .tool-version recognizes all variants of the version description according to [asdf](https://github.com/asdf-vm/asdf). - -If both java-version and java-version-file inputs are provided, the java-version input will be used. + If the `java-version-file` input is specified, the action will extract the version from the file and install it. + + Supported files are .java-version and .tool-versions. + In .java-version file, only the version should be specified (e.g., 17.0.7). + In .tool-versions file, java version should be preceded by the java keyword (e.g., java 17.0.7). + The `.java-version` file recognizes all variants of the version description according to [jenv](https://github.com/jenv/jenv). Similarly, the `.tool-versions` file supports version specifications in accordance with [asdf](https://github.com/asdf-vm/asdf) standards, adhering to Semantic Versioning (semver). + + If both java-version and java-version-file inputs are provided, the java-version input will be used. Valid entry options: ``` major versions: 8, 11, 16, 17, 21 -more specific versions: 1.8.0.2, 17.0, 11.0, 11.0.4, 8.0.232, 8.0.282+8 +more specific versions: 8.0.282+8, 8.0.232, 11.0, 11.0.4, 17.0 early access (EA) versions: 15-ea, 15.0.0-ea versions with specified distribution: openjdk64-11.0.2 ``` From 2e74cbce18569d23ca8b812590dbb83f13ac7c5a Mon Sep 17 00:00:00 2001 From: HarithaVattikuti <73516759+HarithaVattikuti@users.noreply.github.com> Date: Wed, 22 May 2024 10:26:50 -0500 Subject: [PATCH 2/2] Fix versions check failures (#634) * fix macos latest failures * fix failures --- .github/workflows/e2e-cache.yml | 26 ++++++++++---------- .github/workflows/e2e-versions.yml | 38 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index b56be8e..95031db 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: gradle-save steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: maven-save steps: - name: Checkout @@ -121,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -132,17 +132,21 @@ jobs: distribution: 'adopt' java-version: '11' cache: sbt + - name: Setup SBT + if: matrix.os == 'macos-13' + run: | + echo ""Installing SBT..."" + brew install sbt - name: Create files to cache run: sbt update - name: Check files to cache on macos-latest - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: | if [ ! -d ~/Library/Caches/Coursier ]; then echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly" exit 1 fi - - name: Check files to cache on windows-latest if: matrix.os == 'windows-latest' run: | @@ -150,7 +154,6 @@ jobs: echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly" exit 1 fi - - name: Check files to cache on ubuntu-latest if: matrix.os == 'ubuntu-latest' run: | @@ -158,7 +161,6 @@ jobs: echo "::error::The ~/.cache/coursier directory does not exist unexpectedly" exit 1 fi - sbt-restore: runs-on: ${{ matrix.os }} defaults: @@ -168,7 +170,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] needs: sbt-save steps: - name: Checkout @@ -182,14 +184,13 @@ jobs: cache: sbt - name: Confirm that ~/Library/Caches/Coursier directory has been made - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: | if [ ! -d ~/Library/Caches/Coursier ]; then echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly" exit 1 fi ls ~/Library/Caches/Coursier - - name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made if: matrix.os == 'windows-latest' run: | @@ -198,7 +199,6 @@ jobs: exit 1 fi ls ~/AppData/Local/Coursier/Cache - - name: Confirm that ~/.cache/coursier directory has been made if: matrix.os == 'ubuntu-latest' run: | diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 8b9e111..0553d91 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: [ 'temurin', 'adopt', @@ -32,15 +32,15 @@ jobs: 'corretto', 'dragonwell' ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['8', '11', '17'] + version: ['21', '11', '17'] exclude: - distribution: microsoft version: 8 - distribution: dragonwell - os: macos-latest + os: macos-13 include: - distribution: oracle - os: macos-latest + os: macos-13 version: 17 - distribution: oracle os: windows-latest @@ -73,7 +73,7 @@ jobs: distribution: ['temurin', 'zulu', 'liberica'] version: - '11.0' - - '8.0.302' + - '21.0' - '17.0.7+7' include: - distribution: oracle @@ -171,7 +171,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] version: ['17-ea', '15.0.0-ea.14'] steps: - name: Checkout @@ -215,22 +215,22 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'semeru'] java-package: ['jre'] version: ['17.0'] include: - distribution: 'zulu' java-package: jre+fx - version: '8' + version: '21' os: ubuntu-latest - distribution: 'zulu' java-package: jdk+fx - version: '8.0.242' + version: '21.0' os: ubuntu-latest - distribution: 'liberica' java-package: jdk+fx - version: '8' + version: '21' os: ubuntu-latest - distribution: 'liberica' java-package: jre+fx @@ -294,10 +294,10 @@ jobs: uses: actions/checkout@v4 - name: Create .java-version file shell: bash - run: echo "8" > .java-version + run: echo "17" > .java-version - name: Create .tool-versions file shell: bash - run: echo "java 8" > .tool-versions + run: echo "java 17" > .tool-versions - name: setup-java uses: ./ id: setup-java @@ -351,10 +351,10 @@ jobs: uses: actions/checkout@v4 - name: Create .java-version file shell: bash - run: echo "11.0.2" > .java-version + run: echo "17.0.10" > .java-version - name: Create .tool-versions file shell: bash - run: echo "java 11.0.2" > .tool-versions + run: echo "java 17.0.10" > .tool-versions - name: setup-java uses: ./ id: setup-java @@ -362,11 +362,11 @@ jobs: distribution: ${{ matrix.distribution }} java-version-file: ${{matrix.java-version-file }} - name: Verify Java - run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}" + run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}" shell: bash setup-java-version-from-file-major-minor-patch-with-dist: - name: ${{ matrix.distribution }} version from file 'openjdk64-11.0.2' - ${{ matrix.os }} + name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -379,10 +379,10 @@ jobs: uses: actions/checkout@v4 - name: Create .java-version file shell: bash - run: echo "openjdk64-11.0.2" > .java-version + run: echo "openjdk64-17.0.10" > .java-version - name: Create .tool-versions file shell: bash - run: echo "java openjdk64-11.0.2" > .tool-versions + run: echo "java openjdk64-17.0.10" > .tool-versions - name: setup-java uses: ./ id: setup-java @@ -390,5 +390,5 @@ jobs: distribution: ${{ matrix.distribution }} java-version-file: ${{matrix.java-version-file }} - name: Verify Java - run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}" + run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}" shell: bash