diff --git a/.github/workflows/main-publish-release.yml b/.github/workflows/main-publish-release.yml index ee35c07173..909a750232 100644 --- a/.github/workflows/main-publish-release.yml +++ b/.github/workflows/main-publish-release.yml @@ -30,6 +30,24 @@ jobs: - uses: actions/checkout@v3 + - name: Configure Git options + run: | + git config pull.rebase false + git config user.email "contact@dqops.com" + git config user.name "DQOps" + + - name: Switch to the closed source edition + run: git remote add closedsource https://${{ secrets.PAID_REPOSITORY_USER }}:${{ secrets.PAID_REPOSITORY_TOKEN }}@${{ secrets.PAID_REPOSITORY_HOST }}${{ secrets.PAID_REPOSITORY_PATH }} + + - name: Pull the closed source edition + run: git pull -q closedsource closedsource --allow-unrelated-histories --strategy-option=theirs + + - name: Checkout the closed source edition + run: git checkout closedsource + + - name: Merge changes to the closed source edition + run: git merge ${{ github.ref_name }} + - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/mvn-build-develop.yml b/.github/workflows/mvn-build-develop.yml index b26faa357e..469f056925 100644 --- a/.github/workflows/mvn-build-develop.yml +++ b/.github/workflows/mvn-build-develop.yml @@ -32,8 +32,26 @@ jobs: - uses: actions/checkout@v3 + - name: Configure Git options + run: | + git config pull.rebase false + git config user.email "contact@dqops.com" + git config user.name "DQOps" + + - name: Switch to the closed source edition + run: git remote add closedsource https://${{ secrets.PAID_REPOSITORY_USER }}:${{ secrets.PAID_REPOSITORY_TOKEN }}@${{ secrets.PAID_REPOSITORY_HOST }}${{ secrets.PAID_REPOSITORY_PATH }} + + - name: Pull the closed source edition + run: git pull -q closedsource closedsource --allow-unrelated-histories --strategy-option=theirs + + - name: Checkout the closed source edition + run: git checkout closedsource + - name: Add SHORT_SHA env property with commit short sha - run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + run: echo "SHORT_SHA=`echo ``git rev-parse --short=8 HEAD```" >> $GITHUB_ENV + + - name: Merge changes to the closed source edition + run: git merge ${{ github.ref_name }} - name: Set up JDK 17 uses: actions/setup-java@v3 diff --git a/.run/dqo run.run.xml b/.run/dqo run.run.xml index 9bd1bbc87c..933d9ffe5b 100644 --- a/.run/dqo run.run.xml +++ b/.run/dqo run.run.xml @@ -5,7 +5,7 @@