From b5bb83570aaa13b2c2ec80a0388e0946d73bcd67 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 09:10:22 +0100 Subject: [PATCH 01/12] update hashupdate script --- hashupdate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 hashupdate diff --git a/hashupdate b/hashupdate old mode 100644 new mode 100755 index a202c37..943beae --- a/hashupdate +++ b/hashupdate @@ -1,8 +1,8 @@ #!/bin/sh -set -eu +set -eu pipefail # Usage: hashupdate -URL_TEMPLATE=$(grep "$2_URL=" "$1" | sed -E 's/.*="(.*)"/\1/' | tr -d '\r') +URL_TEMPLATE=$(grep "$2_URL=" "$1" | sed -E 's/.*="(.*)"/\1/') URL=$(echo "$URL_TEMPLATE" | sed "s/\$$2_VERSION/$3/g") SHA256=$(curl -sL "$URL" | sha256sum | sed -e 's/ -//g') sed -i -E "s/$2_SHA256=.*/$2_SHA256=$SHA256/" "$1" From 6a589ea2106f376c8f82682b0dc0335aedf42840 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 09:20:21 +0100 Subject: [PATCH 02/12] change libwebp source from chromium to github --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74a0dac..d9928df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ FROM eclipse-temurin AS builder -# bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ git:https://chromium.googlesource.com/webm/libwebp.git|^1 +# bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ https://github.com/webmproject/libwebp.git|^1 # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST +# bump: libwebp link "Release notes" https://github.com/webmproject/libwebp/releases/tag/v$LATEST +# bump: libwebp link "Source diff $CURRENT..$LATEST" https://github.com/webmproject/libwebp/compare/v$CURRENT..v$LATEST ARG LIBWEBP_VERSION=1.4.0 -ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz" -ARG LIBWEBP_SHA256=94ac053be5f8cb47a493d7a56b2b1b7328bab9cff24ecb89fa642284330d8dff +ARG LIBWEBP_URL="https://github.com/webmproject/libwebp/archive/v$$LIBWEBP_VERSION.tar.gz" +ARG LIBWEBP_SHA256=12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381 WORKDIR /app RUN curl "$LIBWEBP_URL" -o libwebp.tar.gz && \ From b94f553b32b202dedfc70ed66bc40eda4fe797bb Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 09:30:33 +0100 Subject: [PATCH 03/12] fix bash script options --- hashupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hashupdate b/hashupdate index 943beae..090e023 100755 --- a/hashupdate +++ b/hashupdate @@ -1,5 +1,5 @@ #!/bin/sh -set -eu pipefail +set -euo # Usage: hashupdate URL_TEMPLATE=$(grep "$2_URL=" "$1" | sed -E 's/.*="(.*)"/\1/') From 85881b1584f2e5b6787258b41303acf17e3a4722 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 09:41:41 +0100 Subject: [PATCH 04/12] fix libwebp configuration in dockerfile --- Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9928df..2c38e4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,13 @@ FROM eclipse-temurin AS builder -# bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ https://github.com/webmproject/libwebp.git|^1 +# bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ git:https://chromium.googlesource.com/webm/libwebp.git|^1 # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST -# bump: libwebp link "Release notes" https://github.com/webmproject/libwebp/releases/tag/v$LATEST -# bump: libwebp link "Source diff $CURRENT..$LATEST" https://github.com/webmproject/libwebp/compare/v$CURRENT..v$LATEST ARG LIBWEBP_VERSION=1.4.0 -ARG LIBWEBP_URL="https://github.com/webmproject/libwebp/archive/v$$LIBWEBP_VERSION.tar.gz" -ARG LIBWEBP_SHA256=12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381 +ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz" +ARG LIBWEBP_SHA256=94ac053be5f8cb47a493d7a56b2b1b7328bab9cff24ecb89fa642284330d8dff WORKDIR /app -RUN curl "$LIBWEBP_URL" -o libwebp.tar.gz && \ +RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz && \ echo "$LIBWEBP_SHA256 libwebp.tar.gz" | sha256sum -c - && \ tar -xzf libwebp.tar.gz --one-top-level=libwebp --strip-components=1 COPY settings.gradle build.gradle gradlew ./ From bb093a133af910534a1564fb86dbee6e94660608 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 11:09:53 +0100 Subject: [PATCH 05/12] update libwebp to its latest version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c38e4e..8c2cab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM eclipse-temurin AS builder # bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ git:https://chromium.googlesource.com/webm/libwebp.git|^1 # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST -ARG LIBWEBP_VERSION=1.4.0 +ARG LIBWEBP_VERSION=1.5.0 ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz" -ARG LIBWEBP_SHA256=94ac053be5f8cb47a493d7a56b2b1b7328bab9cff24ecb89fa642284330d8dff +ARG LIBWEBP_SHA256=d5558cd419c8d46bdc958064cb97f963d1ea793866414c025906ec15033512ed WORKDIR /app RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz && \ From 2eb0c3dd6defe21ef1ded883d1e05417a17158fe Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 11:10:14 +0100 Subject: [PATCH 06/12] update qodana linter to its latest version --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index 86739f6..a543cfe 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -3,5 +3,5 @@ profile: name: qodana.recommended include: - name: VulnerableLibrariesGlobal -linter: jetbrains/qodana-jvm:2024.2 +linter: jetbrains/qodana-jvm:latest projectJDK: temurin-23 From 290107d0a1f914526fbe7c26c111a8121c8be59b Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 11:14:01 +0100 Subject: [PATCH 07/12] disable renovate automerge and wait time --- .github/renovate.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 4a0d8e8..124d5b7 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,35 +3,15 @@ "labels": [ "dependencies" ], - "assignees": [ - "rob93c" - ], "packageRules": [ { - "enabledManagers": [ - "gradle", - "dockerfile", - "github-actions" - ], "matchUpdateTypes": [ "minor", "patch" ], - "automerge": true, - "assignAutomerge": true, - "minimumReleaseAge": "1 week", "matchPackageNames": [ "*" ] - }, - { - "matchManagers": [ - "gradle-wrapper" - ], - "schedule": [ - "at any time" - ], - "automerge": false } ], "extends": [ From 0a97c0b257f5a9d8f1cbc3e8e4b6abca91edef7c Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 11:39:17 +0100 Subject: [PATCH 08/12] fix libwebp sha --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c2cab2..ec01762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM eclipse-temurin AS builder # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST ARG LIBWEBP_VERSION=1.5.0 ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz" -ARG LIBWEBP_SHA256=d5558cd419c8d46bdc958064cb97f963d1ea793866414c025906ec15033512ed +ARG LIBWEBP_SHA256=f4bf49f85991f50e86a5404d16f15b72a053bb66768ed5cc0f6d042277cc2bb8 WORKDIR /app RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz && \ From 1add89737f56a306b1535c22d82352e967b18a7f Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 11:48:02 +0100 Subject: [PATCH 09/12] configure bump to update qodana linter --- Bumpfile | 1 + qodana.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Bumpfile b/Bumpfile index 4468ce3..2e8d2f0 100644 --- a/Bumpfile +++ b/Bumpfile @@ -1,2 +1,3 @@ .github/workflows/unit-test.yml Dockerfile +qodana.yaml diff --git a/qodana.yaml b/qodana.yaml index a543cfe..ba1532c 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -3,5 +3,6 @@ profile: name: qodana.recommended include: - name: VulnerableLibrariesGlobal -linter: jetbrains/qodana-jvm:latest +# bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|n.n|sort +linter: jetbrains/qodana-jvm:2024.3 projectJDK: temurin-23 From d4bb35baaa0e82d5161df7817fda0155d439c28b Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 12:20:09 +0100 Subject: [PATCH 10/12] configure bump to update qodana linter --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index ba1532c..096f25a 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -4,5 +4,5 @@ profile: include: - name: VulnerableLibrariesGlobal # bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|n.n|sort -linter: jetbrains/qodana-jvm:2024.3 +linter: jetbrains/qodana-jvm:2024.2 projectJDK: temurin-23 From c515d128e3d55796b86920c275a67e37d31f6472 Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 12:22:59 +0100 Subject: [PATCH 11/12] update qodana linter --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index 096f25a..ba1532c 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -4,5 +4,5 @@ profile: include: - name: VulnerableLibrariesGlobal # bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|n.n|sort -linter: jetbrains/qodana-jvm:2024.2 +linter: jetbrains/qodana-jvm:2024.3 projectJDK: temurin-23 From 287016ca48d4cef03f99bf3d4b54c21253c28f7d Mon Sep 17 00:00:00 2001 From: Roberto Cella Date: Sat, 21 Dec 2024 13:33:11 +0100 Subject: [PATCH 12/12] improve qodana bump version rule --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index ba1532c..402eb8a 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -3,6 +3,6 @@ profile: name: qodana.recommended include: - name: VulnerableLibrariesGlobal -# bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|n.n|sort +# bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort linter: jetbrains/qodana-jvm:2024.3 projectJDK: temurin-23