Merge ff1f7f380cd5873d486fcb3caec24aa36a162d13 into 67fbd726daaf08212a7b021c1c4d117f94a81dd3

This commit is contained in:
George Adams 2024-08-16 09:30:45 +00:00 committed by GitHub
commit edbe44ca07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 1 deletions

View File

@ -62,6 +62,32 @@ jobs:
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
shell: bash
setup-java-alpine-linux:
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - alpine-linux - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
container:
image: alpine:latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
distribution: ['temurin']
version: ['21', '17']
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install bash
run: apk add --no-cache bash
- name: setup-java
uses: ./
id: setup-java
with:
java-version: ${{ matrix.version }}
distribution: ${{ matrix.distribution }}
- name: Verify Java
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
shell: bash
setup-java-major-minor-versions:
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
needs: setup-java-major-versions

7
dist/setup/index.js vendored
View File

@ -125230,6 +125230,11 @@ class TemurinDistribution extends base_installer_1.JavaBase {
return 'mac';
case 'win32':
return 'windows';
case 'linux':
if (fs_1.default.existsSync('/etc/alpine-release')) {
return 'alpine-linux';
}
return 'linux';
default:
return process.platform;
}
@ -127946,4 +127951,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
/******/ module.exports = __webpack_exports__;
/******/
/******/ })()
;
;

View File

@ -173,6 +173,11 @@ export class TemurinDistribution extends JavaBase {
return 'mac';
case 'win32':
return 'windows';
case 'linux':
if (fs.existsSync('/etc/alpine-release')) {
return 'alpine-linux';
}
return 'linux';
default:
return process.platform;
}