diff --git a/.github/util/re-version.sh b/.github/util/re-version.sh index 71511b960d9..4cd96869070 100755 --- a/.github/util/re-version.sh +++ b/.github/util/re-version.sh @@ -58,6 +58,7 @@ do java -cp $scriptDir ManifestReversion $workdir/META-INF/MANIFEST.MF $version find $workdir/META-INF -name pom.xml -exec sed -i -e "s/0-SNAPSHOT<\/version>/$version<\/version>/g" {} \; + find $workdir/META-INF -name pom.xml -exec sed -i -e "s/$branch-SNAPSHOT<\/version>/$version<\/version>/g" {} \; find $workdir/META-INF -name pom.properties -exec sed -i -e "s/0-SNAPSHOT/$version/g" {} \; find $workdir/META-INF -name plugin*.xml -exec sed -i -e "s/0-SNAPSHOT<\/version>/$version<\/version>/g" {} \; (cd $workdir && jar -uMf $jar META-INF) diff --git a/.github/workflows/build-azure-uber-jar.yml b/.github/workflows/build-azure-uber-jar.yml index df7b046b881..99ef223edd1 100644 --- a/.github/workflows/build-azure-uber-jar.yml +++ b/.github/workflows/build-azure-uber-jar.yml @@ -29,6 +29,7 @@ jobs: repository: liquibase/liquibase-pro ref: ${{ inputs.branch }} token: ${{ secrets.BOT_TOKEN }} + path: liquibase-pro - name: Set up JDK 17 uses: actions/setup-java@v3 @@ -83,12 +84,12 @@ jobs: servers: | [ { - "id": "liquibase-pro", + "id": "liquibase", "username": "liquibot", "password": "${{ secrets.LIQUIBOT_PAT }}" }, { - "id": "liquibase", + "id": "liquibase-pro", "username": "liquibot", "password": "${{ secrets.LIQUIBOT_PAT }}" }, @@ -105,14 +106,15 @@ jobs: maven-version: ${{ env.MAVEN_VERSION }} - name: Set version - run: mvn versions:set -DnewVersion=${{ inputs.liquibase-version }} + run: cd liquibase-pro/liquibase-azure-deps && mvn versions:set -DnewVersion=${{ inputs.liquibase-version }} - name: Build & Test - run: mvn -B clean package + run: | + cd liquibase-pro/liquibase-azure-deps && mvn -B clean package - name: Archive Modules uses: actions/upload-artifact@v3 with: name: liquibase-pro-azure-artifacts path: | - */target/*.jar + liquibase-azure-deps/target/*.jar diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 6ebff10c5f4..21811d05c5b 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -32,13 +32,13 @@ jobs: - run: | echo "Creating version ${{ steps.collect-data.outputs.version }} from ${{ steps.collect-data.outputs.branch }} with artifacts from build ${{ steps.collect-data.outputs.runId }} " - # build-azure-uber-jar: - # needs: [ setup ] - # uses: liquibase/liquibase/.github/workflows/build-azure-uber-jar.yml@master - # with: - # branch: ${{ needs.setup.outputs.branch }} - # liquibase-version: ${{ needs.setup.outputs.version }} - # secrets: inherit + build-azure-uber-jar: + needs: [ setup ] + uses: liquibase/liquibase/.github/workflows/build-azure-uber-jar.yml@master + with: + branch: ${{ needs.setup.outputs.branch }} + liquibase-version: ${{ needs.setup.outputs.version }} + secrets: inherit reversion: needs: [ setup ] @@ -64,13 +64,13 @@ jobs: name: liquibase-artifacts path: download/liquibase-artifacts - # - name: Download liquibase-pro-azure-artifacts - # uses: liquibase/action-download-artifact@v2-liquibase - # with: - # workflow: build-azure-uber-jar.yml - # run_id: ${{ needs.setup.outputs.runId }} - # name: liquibase-pro-azure-artifacts - # path: download/liquibase-pro-azure-artifacts + - name: Download liquibase-pro-azure-artifacts + uses: liquibase/action-download-artifact@v2-liquibase + with: + workflow: build-azure-uber-jar.yml + run_id: ${{ needs.setup.outputs.runId }} + name: liquibase-pro-azure-artifacts + path: download/liquibase-pro-azure-artifacts - name: Set up JDK uses: actions/setup-java@v3 diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml index 4f8b93a6f18..80ea43c2d1d 100644 --- a/.github/workflows/release-published.yml +++ b/.github/workflows/release-published.yml @@ -91,24 +91,29 @@ jobs: ##extracts and sign poms unzip -j liquibase-core-${version}.jar META-INF/maven/org.liquibase/liquibase-core/pom.xml + sed -i -e "s/release-SNAPSHOT<\/version>/${version}<\/version>/" pom.xml ## version didn't end up in pom. So using double quotes mv pom.xml liquibase-core-${version}.pom gpg --batch --pinentry-mode=loopback --passphrase "$GPG_PASSWORD" -ab liquibase-core-${version}.pom unzip -j liquibase-maven-plugin-${version}.jar META-INF/maven/org.liquibase/liquibase-maven-plugin/pom.xml + sed -i -e "s/release-SNAPSHOT<\/version>/${version}<\/version>/" pom.xml mv pom.xml liquibase-maven-plugin-${version}.pom gpg --batch --pinentry-mode=loopback --passphrase "$GPG_PASSWORD" -ab liquibase-maven-plugin-${version}.pom unzip -j liquibase-cdi-${version}.jar META-INF/maven/org.liquibase/liquibase-cdi/pom.xml + sed -i -e "s/release-SNAPSHOT<\/version>/${version}<\/version>/" pom.xml mv pom.xml liquibase-cdi-${version}.pom sed -i -e "s//Liquibase CDI Plugin<\/name>/" liquibase-cdi-${version}.pom ## name didn't end up in pom. Hack it in for now gpg --batch --pinentry-mode=loopback --passphrase "$GPG_PASSWORD" -ab liquibase-cdi-${version}.pom unzip -j liquibase-cdi-jakarta-${version}.jar META-INF/maven/org.liquibase/liquibase-cdi-jakarta/pom.xml + sed -i -e "s/release-SNAPSHOT<\/version>/${version}<\/version>/" pom.xml mv pom.xml liquibase-cdi-jakarta-${version}.pom sed -i -e "s//Liquibase cdi-jakarta Plugin<\/name>/" liquibase-cdi-jakarta-${version}.pom ## name didn't end up in pom. Hack it in for now gpg --batch --pinentry-mode=loopback --passphrase "$GPG_PASSWORD" -ab liquibase-cdi-jakarta-${version}.pom unzip -j liquibase-commercial-${version}.jar META-INF/maven/org.liquibase/liquibase-commercial/pom.xml + sed -i -e "s/release-SNAPSHOT<\/version>/${version}<\/version>/" pom.xml mv pom.xml liquibase-commercial-${version}.pom sed -i -e "s/<\/licenses>/<\/licenses>private<\/connection>private<\/developerConnection>private<\/url><\/scm>/" liquibase-commercial-${version}.pom ## scm info not in the pom gpg --batch --pinentry-mode=loopback --passphrase "$GPG_PASSWORD" -ab liquibase-commercial-${version}.pom diff --git a/.github/workflows/sync-release-master-branch.yml b/.github/workflows/sync-release-master-branch.yml index 8fe06f35a8e..f10358f48ee 100644 --- a/.github/workflows/sync-release-master-branch.yml +++ b/.github/workflows/sync-release-master-branch.yml @@ -3,7 +3,7 @@ name: Sync Release to Master Branch on: push: branches: - - master + - release jobs: sync-branches: @@ -25,5 +25,5 @@ jobs: uses: tretuna/sync-branches@1.4.0 with: GITHUB_TOKEN: ${{secrets.SYNC_RELEASE_MASTER_BRANCH}} - FROM_BRANCH: 'master' - TO_BRANCH: 'release' + FROM_BRANCH: 'release' + TO_BRANCH: 'master'