From a6f6381a6f82ab9cf512b5402327763f20f7f8b1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 10 Mar 2025 10:49:01 +0100 Subject: [PATCH] ci: Move gradle wrapper validation to assemble action Signed-off-by: Andy Scherzinger --- .github/workflows/assembleFlavors.yml | 1 + .../workflows/gradle-wrapper-validation.yml | 29 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index 69840a758..0de9c458f 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -28,6 +28,7 @@ jobs: with: distribution: "temurin" java-version: 17 + - uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0 - name: Build ${{ matrix.flavor }} run: | echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index 7071005c2..000000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,29 +0,0 @@ -# synced from @nextcloud/android-config - -# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2023 Andy Scherzinger -# SPDX-FileCopyrightText: 2023 Tobias Kaminsky -# SPDX-FileCopyrightText: 2023 Álvaro Brey -# SPDX-License-Identifier: GPL-3.0-or-later - -name: "Validate Gradle Wrapper" -on: - pull_request: - branches: [ master, stable-* ] - push: - branches: [ master, stable-* ] - -# Declare default permissions as read only. -permissions: read-all - -concurrency: - group: validate-gradle-wrapper-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0