Merge pull request #891 from ndw/diff-hacking-cleanup

Cleanup the post-diff-hacking hack
qt4cg · Dec 11, 2023 · 4aa97e1 · 4aa97e1
2 parents b9dfdb8 + 03183a4
commit 4aa97e1
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -12,7 +12,6 @@ jobs:
       branch: ${{ steps.check_step.outputs.branch }}
       reponame: ${{ steps.check_step.outputs.reponame }}
       tag: ${{ steps.check_step.outputs.tag }}
-      mbase: ${{ steps.get_mb.outputs.mbase }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v3
@@ -37,20 +36,6 @@ jobs:
           fi
           echo "tag=$tag" >> $GITHUB_OUTPUT
 
-      - name: Checkout the pull request
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Get the merge-base for this PR
-        id: get_mb
-        run: |
-          git checkout master
-          mb=$(git merge-base master ${{ github.event.pull_request.head.sha }})
-          echo "merge-base = $mb"
-          echo "mbase=$mb" >> $GITHUB_OUTPUT
-
   build-and-deploy-pr:
     runs-on: ubuntu-latest
     needs: check_branch
@@ -67,24 +52,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-# what is this supposed to be exactly?
-#      - name: Save XML
-#        run: |
-#          mkdir /tmp/pr-sources
-#          mkdir /tmp/pr-sources/{etc,schema,specifications}
-#          rsync -ar ./etc/ /tmp/pr-sources/etc/
-#          rsync -ar ./schema/ /tmp/pr-sources/schema/
-#          rsync -ar ./specifications/ /tmp/pr-sources/specifications/
-#          find /tmp/pr-sources -type f -name "*.xsl" -exec rm {} \;
-#
-#      - name: Checkout the merge base branch
-#        uses: actions/checkout@v3
-#        with:
-#          ref: ${{ needs.check_branch.outputs.mbase }}
-#
-#      - name: Update XML
-#        run: rsync -var /tmp/pr-sources/ ./
-
       - name: Build specifications
         run: |
           ./gradlew