diff --git a/.github/package-deb-pom.xml b/.github/package-deb-pom.xml index 4398de10..48b9d9df 100644 --- a/.github/package-deb-pom.xml +++ b/.github/package-deb-pom.xml @@ -56,16 +56,7 @@ directory perm - /opt/liquibase - 755 - - - - ${project.basedir}/src/${project.artifactId}/main/archive/${project.artifactId}-env.sh - file - - perm - /etc/profile.d/ + /usr/bin 755 diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index a0d2ca9a..87c864b6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -5,7 +5,7 @@ on: jobs: sonar: - uses: liquibase/build-logic/.github/workflows/sonar-push.yml@v0.3.8 + uses: liquibase/build-logic/.github/workflows/sonar-push.yml@v0.4.1 secrets: inherit create-release: diff --git a/.github/workflows/extension-attach-artifact-release.yml b/.github/workflows/extension-attach-artifact-release.yml index 1ff5ae22..81f76977 100644 --- a/.github/workflows/extension-attach-artifact-release.yml +++ b/.github/workflows/extension-attach-artifact-release.yml @@ -31,9 +31,9 @@ jobs: - name: Get Reusable Script Files run: | - curl -o $PWD/.github/get_draft_release.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/.github/get_draft_release.sh - curl -o $PWD/.github/sign_artifact.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/.github/sign_artifact.sh - curl -o $PWD/.github/upload_asset.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/.github/upload_asset.sh + curl -o $PWD/.github/get_draft_release.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/.github/get_draft_release.sh + curl -o $PWD/.github/sign_artifact.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/.github/sign_artifact.sh + curl -o $PWD/.github/upload_asset.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/.github/upload_asset.sh chmod +x $PWD/.github/get_draft_release.sh chmod +x $PWD/.github/sign_artifact.sh chmod +x $PWD/.github/upload_asset.sh @@ -69,7 +69,7 @@ jobs: tag: ${{ env.release_tag }} fail-if-no-assets: false fail-if-no-release: false - assets: "${{ env.artifact_id }}-*" + assets: '*.*' - name: Import GPG key id: import_gpg diff --git a/.github/workflows/extension-release-published.yml b/.github/workflows/extension-release-published.yml index 3a2ba2ff..dba2e183 100644 --- a/.github/workflows/extension-release-published.yml +++ b/.github/workflows/extension-release-published.yml @@ -68,5 +68,5 @@ jobs: maven-release: needs: release - uses: liquibase/build-logic/.github/workflows/extension-release-prepare.yml@v0.3.8 + uses: liquibase/build-logic/.github/workflows/extension-release-prepare.yml@v0.4.1 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/os-extension-test.yml b/.github/workflows/os-extension-test.yml index deeb4cd4..54832d24 100644 --- a/.github/workflows/os-extension-test.yml +++ b/.github/workflows/os-extension-test.yml @@ -13,6 +13,11 @@ on: required: false default: '["ubuntu-latest", "windows-latest"]' type: string + nigthly: + description: 'Specifies nightly builds against liquibase master-SNAPSHOT' + required: false + default: false + type: boolean jobs: build: @@ -28,6 +33,10 @@ jobs: distribution: 'temurin' cache: 'maven' + - name: Set latest liquibase version + if: ${{ inputs.nigthly }} + run: mvn versions:set-property -Dproperty=liquibase.version -DnewVersion=master-SNAPSHOT + - name: Build and Package run: mvn -B dependency:go-offline clean package -DskipTests=true @@ -89,5 +98,5 @@ jobs: sonar-pr: needs: [ unit-test ] - uses: liquibase/build-logic/.github/workflows/sonar-pull-request.yml@v0.3.8 + uses: liquibase/build-logic/.github/workflows/sonar-pull-request.yml@v0.4.1 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/package-deb.yml b/.github/workflows/package-deb.yml index 0d22a21a..df0a7801 100644 --- a/.github/workflows/package-deb.yml +++ b/.github/workflows/package-deb.yml @@ -54,10 +54,10 @@ jobs: # Under the src folder is where specific packages files live. The GitHub action inputs will modify the universal package-deb-pom.xml to tell the process which assets to use during the packaging step mkdir -p $PWD/.github/src/${{ inputs.artifactId }}/deb/control mkdir -p $PWD/.github/src/${{ inputs.artifactId }}/main/archive - curl -o $PWD/.github/src/${{ inputs.artifactId }}/deb/control/control https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/src/${{ inputs.artifactId }}/deb/control/control - curl -o $PWD/.github/src/${{ inputs.artifactId }}/deb/control/postinst https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/src/${{ inputs.artifactId }}/deb/control/postinst - curl -o $PWD/.github/src/${{ inputs.artifactId }}/main/archive/${{ inputs.artifactId }}-env.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/src/${{ inputs.artifactId }}/main/archive/${{ inputs.artifactId }}-env.sh - curl -o $PWD/.github/package-deb-pom.xml https://raw.githubusercontent.com/liquibase/build-logic/v0.3.8/.github/package-deb-pom.xml + curl -o $PWD/.github/src/${{ inputs.artifactId }}/deb/control/control https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/src/${{ inputs.artifactId }}/deb/control/control + curl -o $PWD/.github/src/${{ inputs.artifactId }}/deb/control/postinst https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/src/${{ inputs.artifactId }}/deb/control/postinst + curl -o $PWD/.github/src/${{ inputs.artifactId }}/main/archive/${{ inputs.artifactId }}-env.sh https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/src/${{ inputs.artifactId }}/main/archive/${{ inputs.artifactId }}-env.sh + curl -o $PWD/.github/package-deb-pom.xml https://raw.githubusercontent.com/liquibase/build-logic/v0.4.1/.github/package-deb-pom.xml - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/.github/workflows/pro-extension-test.yml b/.github/workflows/pro-extension-test.yml index 015a7d93..2eecb520 100644 --- a/.github/workflows/pro-extension-test.yml +++ b/.github/workflows/pro-extension-test.yml @@ -13,6 +13,11 @@ on: required: false default: '["ubuntu-latest", "windows-latest"]' type: string + nigthly: + description: 'Specifies nightly builds against liquibase master-SNAPSHOT' + required: false + default: false + type: boolean secrets: SONAR_TOKEN: description: 'SONAR_TOKEN from the caller workflow' @@ -48,6 +53,10 @@ jobs: distribution: 'temurin' cache: 'maven' + - name: Set latest liquibase version + if: ${{ inputs.nigthly }} + run: mvn versions:set-property -Dproperty=liquibase.version -DnewVersion=master-SNAPSHOT + - name: Build and Package run: mvn -B dependency:go-offline clean package -DskipTests=true @@ -109,5 +118,5 @@ jobs: sonar-pr: needs: [ unit-test ] - uses: liquibase/build-logic/.github/workflows/sonar-pull-request.yml@v0.3.8 - secrets: inherit + uses: liquibase/build-logic/.github/workflows/sonar-pull-request.yml@v0.4.1 + secrets: inherit \ No newline at end of file diff --git a/src/liquibase/deb/control/postinst b/src/liquibase/deb/control/postinst old mode 100644 new mode 100755 index 22fc2013..0013840c --- a/src/liquibase/deb/control/postinst +++ b/src/liquibase/deb/control/postinst @@ -1,6 +1,4 @@ -#!/bin/sh +#!/bin/bash -# Needed once the installation is complete. No need to open a new terminal -export LIQUIBASE_HOME=/opt/liquibase -export PATH=$PATH:$LIQUIBASE_HOME -exec $SHELL \ No newline at end of file +# Define LIQUIBASE_HOME +LIQUIBASE_HOME="/usr/bin" diff --git a/src/liquibase/deb/control/postrm b/src/liquibase/deb/control/postrm new file mode 100755 index 00000000..2983b159 --- /dev/null +++ b/src/liquibase/deb/control/postrm @@ -0,0 +1,5 @@ +#!/bin/bash + +# unset LIQUIBASE_HOME +unset LIQUIBASE_HOME + diff --git a/src/liquibase/main/archive/liquibase-env.sh b/src/liquibase/main/archive/liquibase-env.sh deleted file mode 100644 index 641720a4..00000000 --- a/src/liquibase/main/archive/liquibase-env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Needed when restarting the terminal -export LIQUIBASE_HOME=/opt/liquibase -export PATH=$PATH:$LIQUIBASE_HOME -exec $SHELL \ No newline at end of file