Merge pull request chipsalliance#111 from antmicro/mczyz/fix-remote-p…

…r-deploy Fixes to deployment CI
antmicro · Aug 28, 2023 · 50ab6a3 · 50ab6a3
2 parents ad37519 + 19b0263
commit 50ab6a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/scripts/indexgen/Makefile b/.github/scripts/indexgen/Makefile
@@ -21,7 +21,7 @@ $(GENDIR)/index.md: $(SOURCES) generate.py | $(GENDIR)
 # Build the final webpage. Pass the 'html' target to sphinx, copy report pages
 html: Makefile $(GENDIR)/index.md
 	@$(SPHINXBUILD) -M $@ "$(GENDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-	@rsync -avr "$(ROOTDIR)/" "$(BUILDDIR)/html"
+	@rsync -avr "$(ROOTDIR)/" "$(BUILDDIR)/"
 	@bash update_styles.sh "$(BUILDDIR)"
 
 clean:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,6 +42,9 @@ jobs:
     uses: ./.github/workflows/report-coverage.yml
 
   Publish-to-GH-Pages:
+    concurrency:
+      group: concurrency-group-${{ github.repository }}-publish
+      cancel-in-progress: false
     permissions:
       actions: write
       contents: write

diff --git a/.github/workflows/gh-pages-pr-remove.yml b/.github/workflows/gh-pages-pr-remove.yml
@@ -43,7 +43,8 @@ jobs:
 
       - name: Update the webpage
         run: |
-          rm -rf ${{ env.ROOT_DIR }}/dev/${{ steps.PR.outputs.number }}
+          rm -rf ${{ env.ROOT_DIR }}/html/dev/${{ steps.PR.outputs.number }}
+          rm -rf ${{ env.ROOT_DIR }}/doctrees/dev/${{ steps.PR.outputs.number }}
           .github/scripts/update_webpage.sh ${{ github.ref_name }} ${{ github.event_name }} ${{ steps.PR.outputs.number }}
 
       - name: Deploy