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": [ 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/Dockerfile b/Dockerfile index 74a0dac..ec01762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ 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=f4bf49f85991f50e86a5404d16f15b72a053bb66768ed5cc0f6d042277cc2bb8 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 ./ diff --git a/hashupdate b/hashupdate old mode 100644 new mode 100755 index a202c37..090e023 --- a/hashupdate +++ b/hashupdate @@ -1,8 +1,8 @@ #!/bin/sh -set -eu +set -euo # 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" diff --git a/qodana.yaml b/qodana.yaml index 86739f6..402eb8a 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -3,5 +3,6 @@ profile: name: qodana.recommended include: - name: VulnerableLibrariesGlobal -linter: jetbrains/qodana-jvm:2024.2 +# bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort +linter: jetbrains/qodana-jvm:2024.3 projectJDK: temurin-23