diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 8c8b79ca..30cc69bf 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -93,15 +93,10 @@ jobs: mvn -B versions:set -DnewVersion=${{ needs.setup.outputs.extensionVersion }} -DallowSnapshots=false -DoldVersion="*" mvn -B versions:use-dep-version -Dincludes=org.liquibase:liquibase-core -DdepVersion=${{ needs.setup.outputs.liquibaseVersion }} -DforceVersion=true - if git diff-index --cached --quiet HEAD -- - then - echo "Nothing new to commit" - else - git add pom.xml - git commit -m "Version Bumped to ${{ needs.setup.outputs.extensionVersion }}" - git tag -a -m "Version Bumped to ${{ needs.setup.outputs.extensionVersion }}" liquibase-cassandra-${{ needs.setup.outputs.extensionVersion }} - git push "https://liquibot:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags --tags - fi + git add pom.xml + git commit -m "Version Bumped to ${{ needs.setup.outputs.extensionVersion }}" + git tag -a -m "Version Bumped to ${{ needs.setup.outputs.extensionVersion }}" liquibase-cassandra-${{ needs.setup.outputs.extensionVersion }} + git push "https://liquibot:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:${{ github.ref }} --follow-tags --tags env: GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml index eb9d2ffb..cff9bfaf 100644 --- a/.github/workflows/release-published.yml +++ b/.github/workflows/release-published.yml @@ -2,28 +2,59 @@ name: Release Extension to Sonatype on: release: - types: [published] + types: [ published ] + workflow_dispatch: + inputs: + tag: + description: 'Release Tag' + required: true jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + setup: + name: Setup + runs-on: ubuntu-latest + outputs: + tag: ${{ steps.collect-data.outputs.tag }} + steps: + - name: Collect Data + id: collect-data + uses: actions/github-script@v4 + with: + script: | + let tag; + if (context.payload.inputs) { + tag = context.payload.inputs.tag; + } else { + tag = context.payload.release.tag_name; + } - - name: Set up Java for publishing to Maven Central Repository - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - server-id: sonatype-nexus-staging - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_SECRET }} - gpg-passphrase: GPG_PASSPHRASE + core.setOutput("tag", tag); - - name: Publish to the Maven Central Repository - run: mvn clean deploy -Dmaven.test.skip -P release - env: - MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file + - run: | + echo "Publishing from ${{ steps.collect-data.outputs.tag }}" + + release: + runs-on: ubuntu-latest + needs: [ setup ] + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ needs.setup.outputs.version }} + + - name: Set up Java for publishing to Maven Central Repository + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + server-id: sonatype-nexus-staging + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_SECRET }} + gpg-passphrase: GPG_PASSPHRASE + + - name: Publish to the Maven Central Repository + run: mvn clean deploy -Dmaven.test.skip -P release + env: + MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/pom.xml b/pom.xml index 6866d7f0..ec754e3f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.liquibase.ext liquibase-cassandra - 4.6.3-SNAPSHOT + 4.6.2 Liquibase Extension: Cassandra Database Support Adds support for Cassandra database https://github.com/liquibase/liquibase-cassandra @@ -43,7 +43,7 @@ org.liquibase liquibase-core - 4.6.1 + 4.6.2 junit