diff --git a/.github/workflows/bump-snapshots.yml b/.github/workflows/bump-snapshots.yml index 4b4843f6..f0c22c35 100644 --- a/.github/workflows/bump-snapshots.yml +++ b/.github/workflows/bump-snapshots.yml @@ -32,5 +32,5 @@ jobs: ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowSnapshots=true git diff-index --quiet HEAD pom.xml || (git commit -m "Bump rewrite.version property" pom.xml && git push origin main) env: - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03ebd2e1..e8c29cee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,8 +61,8 @@ jobs: env: # Activates the codegenome profile in pom.xml; empty on pull requests from forks, which # receive no secrets, leaving the profile inactive. - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} - name: publish-snapshots if: github.event_name != 'pull_request' run: ./mvnw --show-version --global-settings=$HOME/.m2/settings.xml --settings=${{ github.workspace }}/settings.xml --file=pom.xml --batch-mode -Dstyle.color=always --activate-profiles=sign-artifacts clean deploy -DskipTests @@ -71,8 +71,8 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN }} SONATYPE_SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }} - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} # The same snapshots again, to the Code Genome Project; the AWS credentials below activate the # codegenome-publish profile, which points distributionManagement at its bucket. @@ -84,8 +84,8 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.CGP_AWS_SECRET_ACCESS_KEY }} AWS_REGION: us-west-2 SONATYPE_SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }} - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} - name: slack-notification if: failure() && github.event_name == 'schedule' && (github.repository_owner == 'openrewrite' || github.repository_owner == 'moderneinc') diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 69cdd4fa..3a296325 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -51,8 +51,8 @@ jobs: ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowDowngrade=true git diff-index --quiet HEAD pom.xml || git commit -m "Bump rewrite.version property" pom.xml && rm -f pom.xml.versionsBackup env: - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} - name: publish-release id: publish-release @@ -62,8 +62,8 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN }} SONATYPE_SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }} - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} - name: github-release if: ${{ success() }} @@ -89,8 +89,8 @@ jobs: ./mvnw versions:update-properties -DincludeProperties=rewrite.version,rewrite-polyglot.version -DallowSnapshots=true git diff-index --quiet HEAD pom.xml || (git commit -m "Bump rewrite.version property" pom.xml && git push origin main && rm -f pom.xml.versionsBackup) env: - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }} # Deploy the artifacts release:perform left in target/checkout to the Code Genome Project too, as # the AWS credentials below activate the codegenome-publish profile. Last, so a failure here costs @@ -103,5 +103,5 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.CGP_AWS_SECRET_ACCESS_KEY }} AWS_REGION: us-west-2 SONATYPE_SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }} - CODEGENOME_USERNAME: ${{ secrets.CGP_ARTIFACTS_MAVEN_USERNAME }} - CODEGENOME_TOKEN: ${{ secrets.CGP_ARTIFACTS_MAVEN_TOKEN }} + CODEGENOME_USERNAME: ${{ secrets.CODEGENOME_USERNAME }} + CODEGENOME_TOKEN: ${{ secrets.CODEGENOME_TOKEN }}