Skip to content

Commit

Permalink
Stashing changes after fetching (in the right place(
Browse files Browse the repository at this point in the history
  • Loading branch information
Clément committed Jan 10, 2025
1 parent 515feb7 commit 2694b25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/build_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
files: content/release.zip
- name: Switching to quartz 🪴
run: |
git stash
git checkout quartz
# ^ 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.
# If we had two different workflows, we would need to re-download the package created previously before being able to deploy the website.
Expand Down
2 changes: 1 addition & 1 deletion source/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ $(BUILD_DIR)book.docx: $(SOURCE_BOOK)

.PHONY: fetch
fetch:
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
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

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

Expand Down

0 comments on commit 2694b25

Please sign in to comment.