Skip to content

Commit 2694b25

Browse files
author
Clément
committed
Stashing changes after fetching (in the right place(
1 parent 515feb7 commit 2694b25

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/build_and_deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
files: content/release.zip
8282
- name: Switching to quartz 🪴
8383
run: |
84+
git stash
8485
git checkout quartz
8586
# ^ This part is a bit tricky. We built the content/ folder previously, and since it is not tracked by github, this folder stays even if we change branch.
8687
# If we had two different workflows, we would need to re-download the package created previously before being able to deploy the website.

source/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ $(BUILD_DIR)book.docx: $(SOURCE_BOOK)
547547

548548
.PHONY: fetch
549549
fetch:
550-
wget https://github.com/princomp/princomp.github.io/releases/download/latest/release.zip -P ../ && cd ../ && unzip -q release.zip && cd content && rsync -avR $(PROJECT_DIR)**.zip ../source && rsync -avR $(CLA_DIR)**.md ../source && rsync -avR $(EXO_DIR)* ../source || true && git stash
550+
wget https://github.com/princomp/princomp.github.io/releases/download/latest/release.zip -P ../ && cd ../ && unzip -q release.zip && cd content && rsync -avR $(PROJECT_DIR)**.zip ../source && rsync -avR $(CLA_DIR)**.md ../source && rsync -avR $(EXO_DIR)* ../source || true
551551

552552
book: $(BUILD_DIR)book.html $(BUILD_DIR)book.pdf $(BUILD_DIR)book.odt $(BUILD_DIR)book.docx
553553

0 commit comments

Comments
 (0)