From 9ca1aa14712057a71bdd28734ae57a92f689525a Mon Sep 17 00:00:00 2001 From: jesperancinha Date: Fri, 19 Jul 2024 16:22:43 +0200 Subject: [PATCH] Updates --- .github/dependabot.yml | 0 .github/workflows/whiskers-merge.yml | 2 +- .github/workflows/whiskers-pull-request.yml | 8 ++++---- .github/workflows/whiskers.yml | 8 ++++---- Makefile.mk | 2 +- whiskers-graalvm/jvm/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) mode change 100755 => 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/whiskers-merge.yml b/.github/workflows/whiskers-merge.yml index cb287a75..6a654a48 100644 --- a/.github/workflows/whiskers-merge.yml +++ b/.github/workflows/whiskers-merge.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.1.1 + uses: dependabot/fetch-metadata@v2 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs diff --git a/.github/workflows/whiskers-pull-request.yml b/.github/workflows/whiskers-pull-request.yml index 5c25113a..92b75c30 100644 --- a/.github/workflows/whiskers-pull-request.yml +++ b/.github/workflows/whiskers-pull-request.yml @@ -59,7 +59,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v3 - - name: Setup Gradle Env + - name: Setup Gradle 8.9 run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'" - name: Build Gradle @@ -89,7 +89,7 @@ jobs: - name: Setup Binaries run: make setup-binaries - - name: Setup Gradle Env + - name: Setup Gradle 8.9 run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'" - name: Install Kotlin Native @@ -138,7 +138,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'adopt' java-version: '21' - name: Setup Gradle @@ -160,7 +160,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'adopt' java-version: '21' - name: Setup Gradle diff --git a/.github/workflows/whiskers.yml b/.github/workflows/whiskers.yml index b32851b7..123e237e 100644 --- a/.github/workflows/whiskers.yml +++ b/.github/workflows/whiskers.yml @@ -59,7 +59,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v3 - - name: Setup Gradle Env + - name: Setup Gradle 8.9 run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'" - name: Build Gradle @@ -89,7 +89,7 @@ jobs: - name: Setup Binaries run: make setup-binaries - - name: Setup Gradle Env + - name: Setup Gradle 8.9 run: export GRADLE_OPTS="-Xmx2048m -Dorg.gradle.jvmargs='-Xmx2048m -XX:MaxPermSize=2048m'" - name: Install Kotlin Native @@ -138,7 +138,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'adopt' java-version: '21' - name: Setup Gradle @@ -160,7 +160,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'adopt' java-version: '21' - name: Setup Gradle diff --git a/Makefile.mk b/Makefile.mk index 047606ce..1b479442 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -1,6 +1,6 @@ SHELL := /bin/bash GITHUB_RUN_ID ?=123 -GRADLE_VERSION ?= 8.7 +GRADLE_VERSION ?= 8.9 b: diff --git a/whiskers-graalvm/jvm/Dockerfile b/whiskers-graalvm/jvm/Dockerfile index 4870b864..17997cd3 100644 --- a/whiskers-graalvm/jvm/Dockerfile +++ b/whiskers-graalvm/jvm/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-alpine +FROM eclipse-temurin:21-alpine WORKDIR /root