diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 250871b..2ddc304 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -21,5 +21,6 @@ jobs: - name: Build env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build --no-daemon diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91f4fa3..a16e428 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,8 @@ jobs: - name: Build env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew startShadowScripts clean - name: Setup Node.js @@ -55,8 +56,9 @@ jobs: env: DOCKER_REGISTRY_USER: ${{ github.actor }} DOCKER_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} - name: Set Portainer stack webhook URL based on branch run: | diff --git a/build.gradle.kts b/build.gradle.kts index 0df4c07..46140ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,12 +59,10 @@ repositories { google() mavenLocal() maven { + name = "githubPackages" // A repository must be specified for some reason. "registry" is a dummy. url = uri("https://maven.pkg.github.com/revanced/registry") - credentials { - username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") - } + credentials(PasswordCredentials::class) } }