diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index 0a68f5dc..00000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: "Validate Gradle Wrapper" -on: - pull_request: - push: - branches-ignore: - - 'dependabot/**' - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: gradle/actions/wrapper-validation@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e0ba85df..ee1bf35d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,13 +90,15 @@ jobs: cache: 'npm' cache-dependency-path: komga-webui/package-lock.json - - uses: actions/setup-java@v4 + - name: Setup Java 21 + uses: actions/setup-java@v4 with: java-version: 21 java-package: 'jdk' distribution: 'temurin' - - uses: actions/setup-java@v4 + - name: Setup Java 17 + uses: actions/setup-java@v4 with: java-version: 17 java-package: 'jdk' @@ -121,7 +123,8 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: gradle/actions/setup-gradle@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build run: ./gradlew :komga:prepareThymeLeaf :komga:bootJar :komga-tray:jar diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff2c107b..e1ef888e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,18 +16,21 @@ jobs: name: Test server steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - name: Setup Java 21 + uses: actions/setup-java@v4 with: java-version: 21 java-package: 'jdk' distribution: 'temurin' - - uses: actions/setup-java@v4 + - name: Setup Java 17 + uses: actions/setup-java@v4 with: java-version: 17 java-package: 'jdk' distribution: 'temurin' - - uses: gradle/actions/setup-gradle@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build run: ./gradlew build :komga-tray:jar