Merge pull request #890 from ndw/diff-hacking

Stop fussing with merge base branch
qt4cg · Dec 11, 2023 · b9dfdb8 · b9dfdb8
2 parents f0c0cd8 + a590e9c
commit b9dfdb8
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -48,6 +48,7 @@ jobs:
         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:
@@ -66,22 +67,23 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - 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/ ./
+# 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: |