From fd5a0ea3a0eebb2eb269c01a1a29fcbd02535732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 22 May 2024 13:34:25 -0400 Subject: [PATCH] Remove temporary fix to transition from build to content. --- .github/workflows/build.yaml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dea95b7b..d2a9d4eb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -44,7 +44,7 @@ jobs: - name: Fetch previous version โคต๏ธ run: | cd /home/runner/work/csci-1301.github.io/csci-1301.github.io/ - wget https://github.com/csci-1301/csci-1301.github.io/releases/download/latest/release.zip && unzip -q release.zip && cd build && rsync -avR labs/*/*.zip ../ + wget https://github.com/csci-1301/csci-1301.github.io/releases/download/latest/release.zip && unzip -q release.zip && cd content && rsync -avR labs/*/*.zip ../ - name: Build ๐Ÿ—๏ธ run: make all - name: Deploy website ๐Ÿš€ diff --git a/Makefile b/Makefile index e27a34c3..c35d56cb 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ TARGET_DOC_FILES_HTML := $(addprefix $(BUILD_DIR), $(addsuffix .html, $(basename # 3. Extract the name of the file without the extension using basename (e.g. "about"), # 4. Add the suffix ".html" (e.g. "about.html"), # 5. Add the prefix "docs" (e.g. "docs/about.html"). -# 6. Add the prefix "build" (e.g. "content/docs/about.html"). +# 6. Add the prefix "content" (e.g. "content/docs/about.html"). # This allows to automatically build the list of targets (the content/html files) # from the list of md files in docs. @@ -81,7 +81,7 @@ TARGET_LAB_INSTRUCTION_FILES_HTML := $(addprefix $(BUILD_DIR), $(addsuffix index # 1. Look at the SOURCE_LAB_INSTRUCTION_FILES, (e.g. "labs/HelloWorld/readme.md") # 2. Extract the directory path using dir (e.g. "labs/HelloWorld/"), # 3. Append "index.html" to the end of it (e.g. "labs/HelloWorld/index.html"), -# 4. Add the prefix "build" (e.g. "content/labs/HelloWorld/index.html"). +# 4. Add the prefix "content" (e.g. "content/labs/HelloWorld/index.html"). # This allows to automatically build the list of targets (the content/labs/*/index.html files) # from the list of md files in the sub-directories in labs/.