From a3797981027313a7aff96a1a7dfdcb53724d5fc4 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 12:30:06 +0200 Subject: [PATCH 01/10] update deprecated actions in publish-docker workflow --- .github/workflows/publish-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 3b7632b..a36d95b 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Workaround: https://github.com/docker/build-push-action/issues/461 - name: Setup Docker buildx @@ -59,7 +59,7 @@ jobs: # https://github.com/docker/build-push-action - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} From 9afde51938ec2c60cca7414a176fd3fdca09b1c8 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 12:37:43 +0200 Subject: [PATCH 02/10] update deprecated actions in ci --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5aaa591..86978d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,10 @@ jobs: steps: # Checkout the repository of both elk and elkjs, place them next to each other. - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: elk-live - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: repository: eclipse/elk-models path: elk-live/elk-models @@ -34,19 +34,20 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle - name: Cache npm - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json', '**/yarn.lock') }} restore-keys: ${{ runner.os }}-node- - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ matrix.java-version }} - name: Grant execute permission for gradlew run: chmod +x $GITHUB_WORKSPACE/elk-live/server/gradlew - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} # Build client-side code From 24e27acd094b41cd5b88ec7899647c69da2403f0 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 12:43:10 +0200 Subject: [PATCH 03/10] update build-push-action to v5 --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index a36d95b..b084562 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -59,7 +59,7 @@ jobs: # https://github.com/docker/build-push-action - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} From 60cd389915dde9eb816c7a930c584de46e34f215 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:04:00 +0200 Subject: [PATCH 04/10] setup java version --- .github/workflows/publish-docker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index b084562..1d586b4 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -54,6 +54,13 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '11' + # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action From 9a12c3a422e1b7593f9a35dc081deac295ef648e Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:05:43 +0200 Subject: [PATCH 05/10] setup java version --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 1d586b4..bacad76 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -55,7 +55,7 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Set up JDK ${{ matrix.java-version }} + - name: Set up JDK 11 uses: actions/setup-java@v2 with: distribution: 'zulu' From 0859cd1cc0bd9bdd8c7945d9e87156f57197f282 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:07:07 +0200 Subject: [PATCH 06/10] remove setup-java --- .github/workflows/publish-docker.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index bacad76..b084562 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -54,13 +54,6 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - distribution: 'zulu' - java-version: '11' - # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action From 9430b5f3077312e1b0eef520e340d26b0f8a0881 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:19:09 +0200 Subject: [PATCH 07/10] test old alpine release --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1e979c..582ae1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.19 LABEL authors="Arnd Plumhoff , Sascha Hoppe " From 685092b3d8ffa3ef892ec0493ed14a709462bde1 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:21:22 +0200 Subject: [PATCH 08/10] update delete-package-versions --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index b084562..ff1c9b6 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -68,7 +68,7 @@ jobs: cache-to: type=gha,mode=max - name: Clean container registry - uses: actions/delete-package-versions@v4 + uses: actions/delete-package-versions@v5 with: package-name: "elk-live" package-type: "container" From 6187b109d608f02b33e3a6a99edf13b9443ffb45 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:43:58 +0200 Subject: [PATCH 09/10] update setup-java action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86978d9..1ef4906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('**/package.json', '**/yarn.lock') }} restore-keys: ${{ runner.os }}-node- - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java-version }} From bd13d34339fd93b5c8dd7a2e7880cde82f3d2bca Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Fri, 24 May 2024 13:46:30 +0200 Subject: [PATCH 10/10] remove tabs from yaml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ef4906..737c6b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'zulu' java-version: ${{ matrix.java-version }} - name: Grant execute permission for gradlew run: chmod +x $GITHUB_WORKSPACE/elk-live/server/gradlew