diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82518905..98e58d6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,38 +150,27 @@ jobs: path: | **/target/surefire-reports/*.xml - # Uncomment these before merging upstream again; this Action is custom to TBD and can't be verified in ALRubinger fork - #- name: Generate an access token to trigger downstream repo - # uses: actions/create-github-app-token@2986852ad836768dfea7781f31828eb3e17990fa # v1.6.2 - # id: generate_token - # if: github.ref == 'refs/heads/main' - # with: - # app-id: ${{ secrets.CICD_ROBOT_GITHUB_APP_ID }} - # private-key: ${{ secrets.CICD_ROBOT_GITHUB_APP_PRIVATE_KEY }} - # owner: TBD54566975 - # repositories: sdk-report-runner - #- name: Generate an access token to trigger downstream repo - # uses: actions/create-github-app-token@2986852ad836768dfea7781f31828eb3e17990fa # v1.6.2 - # id: generate_token - # if: github.ref == 'refs/heads/main' - # with: - # app-id: ${{ secrets.CICD_ROBOT_GITHUB_APP_ID }} - # private-key: ${{ secrets.CICD_ROBOT_GITHUB_APP_PRIVATE_KEY }} - # owner: TBD54566975 - # repositories: sdk-report-runner - - #- name: Trigger sdk-report-runner report build - # if: github.ref == 'refs/heads/main' - # run: | - # curl -L \ - # -H "Authorization: Bearer ${APP_TOKEN}" \ - # -H "X-GitHub-Api-Version: 2022-11-28" \ - # -H "Content-Type: application/json" \ - # --fail \ - # --data '{"ref": "main"}' \ - # https://api.github.com/repos/TBD54566975/sdk-report-runner/actions/workflows/build-report.yaml/dispatches - # env: - # APP_TOKEN: ${{ steps.generate_token.outputs.token }} + - name: Generate an access token to trigger downstream repo + uses: actions/create-github-app-token@2986852ad836768dfea7781f31828eb3e17990fa # v1.6.2 + id: generate_token + if: github.ref == 'refs/heads/main' + with: + app-id: ${{ secrets.CICD_ROBOT_GITHUB_APP_ID }} + private-key: ${{ secrets.CICD_ROBOT_GITHUB_APP_PRIVATE_KEY }} + owner: TBD54566975 + repositories: sdk-report-runner + - name: Trigger sdk-report-runner report build + if: github.ref == 'refs/heads/main' + run: | + curl -L \ + -H "Authorization: Bearer ${APP_TOKEN}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + -H "Content-Type: application/json" \ + --fail \ + --data '{"ref": "main"}' \ + https://api.github.com/repos/TBD54566975/sdk-report-runner/actions/workflows/build-report.yaml/dispatches + env: + APP_TOKEN: ${{ steps.generate_token.outputs.token }} # Ensure both MacOS and Ubuntu build/test jobs succeeded confirm-successful-build-and-tests: # Wait on both jobs to succeed diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4a2db20..26f0370e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,11 +107,11 @@ jobs: run: | echo $(git describe --tags) # Maven deploy lifecycle will build, run tests, verify, sign, and deploy - #mvn \ - # deploy \ - # -P ossrh,sign-artifacts \ - # --batch-mode \ - # --settings .maven_settings.xml + mvn \ + deploy \ + -P ossrh,sign-artifacts \ + --batch-mode \ + --settings .maven_settings.xml env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/pom.xml b/pom.xml index 49fde1fc..7add096c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,10 +22,10 @@ - scm:git:git://github.com/ALRubinger/tbdex-kt.git + scm:git:git://github.com/TBD54566975/tbdex-kt.git - scm:git:https://github.com/ALRubinger/tbdex-kt.git - https://github.com/ALRubinger/tbdex-kt + scm:git:https://github.com/TBD54566975/tbdex-kt.git + https://github.com/TBD54566975/tbdex-kt HEAD