From 1411ef367b237357b5630accf57fa9da6453f137 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 16 Aug 2024 10:16:19 +0100 Subject: [PATCH 1/7] temurin: add support for Alpine Linux --- src/distributions/temurin/installer.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/distributions/temurin/installer.ts b/src/distributions/temurin/installer.ts index 8d03de745..51d523f6e 100644 --- a/src/distributions/temurin/installer.ts +++ b/src/distributions/temurin/installer.ts @@ -171,6 +171,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; } From 6323dcf952e5703d18d63a6e7530b24df5244940 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 16 Aug 2024 10:19:46 +0100 Subject: [PATCH 2/7] attempt to add e2e test for Alpine --- .github/workflows/e2e-versions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 845fce16f..103d493d6 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -17,6 +17,8 @@ jobs: setup-java-major-versions: name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} runs-on: ${{ matrix.os }} + container: + image: ${{ matrix.container }} strategy: fail-fast: false matrix: From 45620929c579001803541e3b39792d7f9ee87b65 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 16 Aug 2024 10:20:34 +0100 Subject: [PATCH 3/7] add dist --- dist/setup/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dist/setup/index.js b/dist/setup/index.js index fb687e03f..1fca71ae9 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -80035,6 +80035,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; } From c913721a1451df0ed9a27e5b7501366ec7f9c1d7 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 16 Aug 2024 10:23:50 +0100 Subject: [PATCH 4/7] rework test --- .github/workflows/e2e-versions.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 103d493d6..845fce16f 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -17,8 +17,6 @@ jobs: setup-java-major-versions: name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} runs-on: ${{ matrix.os }} - container: - image: ${{ matrix.container }} strategy: fail-fast: false matrix: From 453087a25cb9a411047e3881c5816dbf3bdaeaf8 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 16 Aug 2024 10:30:36 +0100 Subject: [PATCH 5/7] rework test --- .github/workflows/e2e-versions.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 845fce16f..b01ce2f7b 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -86,6 +86,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 From 2e8dabe420c256ef1bc0a4b2763b4c7d9f3a8281 Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 16 Sep 2024 20:29:42 +0100 Subject: [PATCH 6/7] Update .github/workflows/e2e-versions.yml Co-authored-by: christian <153755613+skateball@users.noreply.github.com> --- .github/workflows/e2e-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index b01ce2f7b..2d643ecd0 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -95,7 +95,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - distribution: ['temurin'] + distribution: ['temurin', 'sapmachine'] version: ['21', '17'] steps: - name: Checkout From 9fb63696bc3be54ea8eda3f13a23de94b915ac73 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 3 Jun 2026 16:52:36 +0100 Subject: [PATCH 7/7] rebase --- .github/workflows/e2e-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 2d643ecd0..7dc8d8a71 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -99,7 +99,7 @@ jobs: version: ['21', '17'] steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install bash run: apk add --no-cache bash - name: setup-java