diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b14f539..6a623eb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,3 +1,4 @@ +name: Maven Publish Release on: workflow_dispatch: inputs: @@ -21,6 +22,7 @@ on: jobs: publish: runs-on: ubuntu-latest + if: github.actor == 'agaffney' || github.actor == 'verbotenj' || github.actor == 'wolf31o2' steps: - uses: actions/checkout@v5 - name: Set up JDK ${{ inputs.javaVersion }} @@ -40,52 +42,18 @@ jobs: xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd"> - - s3.applause-public-repo - ${{ secrets.APPLAUSE_REPO_USER_NAME }} - ${{ secrets.APPLAUSE_REPO_PASSWORD }} - - - s3.applause-public-snapshots - ${{ secrets.APPLAUSE_REPO_USER_NAME }} - ${{ secrets.APPLAUSE_REPO_PASSWORD }} - + + s3.applause-public-repo + ${{ secrets.REPO_PUBLISH_AWS_ACCESS_KEY_ID }} + ${{ secrets.REPO_PUBLISH_AWS_SECRET_ACCESS_KEY }} + + + s3.applause-public-snapshots + ${{ secrets.REPO_PUBLISH_AWS_ACCESS_KEY_ID }} + ${{ secrets.REPO_PUBLISH_AWS_SECRET_ACCESS_KEY }} + - - - - - true - - - - - applause-public-repo - Repository for Applause public artifacts (releases) - https://repo.applause.com/repository/public - true - false - - - applause-public-snapshots - Repository for Applause public artifacts (snapshots) - https://repo.applause.com/repository/snapshots - false - true - - - - - applause-public-repo - Repository for Applause public artifacts (releases) - https://repo.applause.com/repository/public - true - false - - - - EOF @@ -108,8 +76,8 @@ jobs: git commit -am "GHA: release version \${VERSION}" git tag v\${VERSION} -am "GHA: publish public-$GITHUB_REPO_NAME v\${VERSION}" git log -1 - # git push origin v\${VERSION} - # git push origin HEAD:${{ inputs.branch }} + git push origin v\${VERSION} + git push origin HEAD:${{ inputs.branch }} # Increment incremental version and set SNAPSHOT mvn build-helper:parse-version versions:set -DgenerateBackupPoms=false -DnewVersion=\\${parsedVersion.majorVersion}.\\${parsedVersion.minorVersion}.\\${parsedVersion.nextIncrementalVersion}-SNAPSHOT @@ -121,4 +89,4 @@ jobs: VERSION=`cat VERSION` git commit -am "GHA: SNAPSHOT version \${VERSION}" git diff HEAD^ HEAD - # git push origin HEAD:${{ inputs.branch }} + git push origin HEAD:${{ inputs.branch }} diff --git a/.github/workflows/publish_private.yml b/.github/workflows/publish_private.yml deleted file mode 100644 index 977c9c0..0000000 --- a/.github/workflows/publish_private.yml +++ /dev/null @@ -1,87 +0,0 @@ -name: Maven Publish Private - -on: - workflow_dispatch: - inputs: - javaVersion: - description: "Java version to use" - default: "21" - type: string - mavenProperties: - description: "Maven properties to use" - default: "-DskipGithub=true" - type: string - mavenTasks: - description: "Maven tasks to use" - default: "clean install deploy" - type: string - -jobs: - build-and-publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - - name: Set up JDK ${{ inputs.javaVersion }} - uses: actions/setup-java@v5 - with: - java-version: "${{ inputs.javaVersion }}" - distribution: "temurin" - - name: Set up Maven - uses: hb0730/maven-action@v1.0.2 - with: - maven-version: 3.8.9 - - - name: Create Maven settings.xml - run: | - cat << 'EOF' > $HOME/.m2/settings.xml - - - - s3.applause-private-repo - ${{ secrets.APPLAUSE_REPO_USER_NAME }} - ${{ secrets.APPLAUSE_REPO_PASSWORD }} - - - - - - - true - - - - - applause-repo - Repository for Applause private artifacts - https://repo.applause.com/repository/private - true - true - - - applause-public-repo - Repository for Applause public artifacts (releases) - https://repo.applause.com/repository/public - true - false - - - - - applause-public-repo - Repository for Applause public artifacts (releases) - https://repo.applause.com/repository/public - true - false - - - - - - EOF - - - name: Publish - run: | - mvn ${{ inputs.mavenProperties }} ${{ inputs.mavenTasks }} diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml new file mode 100644 index 0000000..cf2d8e1 --- /dev/null +++ b/.github/workflows/publish_snapshot.yml @@ -0,0 +1,61 @@ +name: Maven Publish Snapshot + +on: + workflow_dispatch: + inputs: + javaVersion: + description: "Java version to use" + default: "21" + type: string + mavenProperties: + description: "Maven properties to use" + default: "-DskipGithub=true" + type: string + mavenTasks: + description: "Maven tasks to use" + default: "clean install deploy" + type: string + +permissions: + contents: read + +jobs: + build-and-publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: Set up JDK ${{ inputs.javaVersion }} + uses: actions/setup-java@v5 + with: + java-version: "${{ inputs.javaVersion }}" + distribution: "temurin" + - name: Set up Maven + uses: hb0730/maven-action@v1.0.2 + with: + maven-version: 3.8.9 + + - name: Create Maven settings.xml + run: | + cat << 'EOF' > $HOME/.m2/settings.xml + + + + s3.applause-public-repo + ${{ secrets.REPO_PUBLISH_AWS_ACCESS_KEY_ID }} + ${{ secrets.REPO_PUBLISH_AWS_SECRET_ACCESS_KEY }} + + + s3.applause-public-snapshots + ${{ secrets.REPO_PUBLISH_AWS_ACCESS_KEY_ID }} + ${{ secrets.REPO_PUBLISH_AWS_SECRET_ACCESS_KEY }} + + + + EOF + + - name: Publish + run: | + mvn ${{ inputs.mavenProperties }} ${{ inputs.mavenTasks }}