diff --git a/action.yml b/action.yml index 686f71c..67b20dd 100644 --- a/action.yml +++ b/action.yml @@ -30,19 +30,21 @@ runs: roleId: "${{ inputs.roleid }}" secretId: "${{ inputs.secretid }}" secrets: | - kv/data/ci/nexus username | NEXUS_USERNAME ; - kv/data/ci/nexus password | NEXUS_PASSWORD ; + kv/data/ci/nexus username | MAVEN_USERNAME ; + kv/data/ci/nexus password | MAVEN_CENTRAL_TOKEN ; + kv/data/ci/nexus username | JRELEASER_ARTIFACTORY_USERNAME ; + kv/data/ci/nexus password | JRELEASER_ARTIFACTORY_TOKEN ; kv/data/ci/vulnz username | VULNZ_USERNAME ; kv/data/ci/vulnz password | VULNZ_PASSWORD ; - kv/data/ci/releasebot gpgPrivateKey | RELEASEBOT_PRIVATE_KEY ; - kv/data/ci/releasebot gpgPublicKey | RELEASEBOT_PUBLIC_KEY ; - kv/data/ci/releasebot gpgPassphrase | RELEASEBOT_PASSPHRASE ; + kv/data/ci/releasebot gpgPrivateKey | JRELEASER_GPG_PRIVATE_KEY ; + kv/data/ci/releasebot gpgPublicKey | JRELEASER_GPG_PUBLIC_KEY ; + kv/data/ci/releasebot gpgPassphrase | JRELEASER_GPG_PASSPHRASE ; kv/data/ci/releasebot ciToken | JRELEASER_GITEA_TOKEN ; kv/data/ci/signing gpgPrivateKey | GPG_PRIVATE_KEY ; kv/data/ci/signing gpgPublicKey | GPG_PUBLIC_KEY ; - kv/data/ci/signing gpgPassphrase | GPG_PASSPHRASE ; - kv/data/ci/sonarqube sonarToken | SONARQUBE_TOKEN ; - kv/data/ci/sonarqube sonarHost | SONARQUBE_HOST ; + kv/data/ci/signing gpgPassphrase | MAVEN_GPG_PASSPHRASE ; + kv/data/ci/sonarqube sonarToken | SONAR_TOKEN ; + kv/data/ci/sonarqube sonarHost | SONAR_HOST_URL ; - name: "Set up Environment" shell: "bash" @@ -103,18 +105,18 @@ runs: [ { "id": "maven-group", - "username": "${{ env.NEXUS_USERNAME }}", - "password": "${{ env.NEXUS_PASSWORD }}" + "username": "${{ env.MAVEN_USERNAME }}", + "password": "${{ env.MAVEN_CENTRAL_TOKEN }}" }, { "id": "maven-snapshots", - "username": "${{ env.NEXUS_USERNAME }}", - "password": "${{ env.NEXUS_PASSWORD }}" + "username": "${{ env.MAVEN_USERNAME }}", + "password": "${{ env.MAVEN_CENTRAL_TOKEN }}" }, { "id": "maven-releases", - "username": "${{ env.NEXUS_USERNAME }}", - "password": "${{ env.NEXUS_PASSWORD }}" + "username": "${{ env.MAVEN_USERNAME }}", + "password": "${{ env.MAVEN_CENTRAL_TOKEN }}" }, { "id": "vulnz", @@ -136,8 +138,8 @@ runs: id: "import-gpg" uses: "https://github.com/crazy-max/ghaction-import-gpg@v6" with: - gpg_private_key: "${{ env.RELEASEBOT_PRIVATE_KEY }}" - passphrase: "${{ env.RELEASEBOT_PASSPHRASE }}" + gpg_private_key: "${{ env.JRELEASER_GPG_PRIVATE_KEY }}" + passphrase: "${{ env.JRELEASER_GPG_PASSPHRASE }}" git_user_signingkey: true git_commit_gpgsign: true