diff --git a/.gitignore b/.gitignore index 75eed7f..90cfadf 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,6 @@ test.* # the md to pdf process /**/*_html /**/*_pdf +/**/html_* +/**/pdf_* /**/errors.log \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cd585f..9d9be73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,9 @@ pdf: artifacts: name: "PDFs" paths: - - Handovers_pdf/ - - Minutes_pdf/ - - Budget_pdf/ + - pdf_Handovers/ + - pdf_Minutes/ + - pdf_Budget/ - errors.log rules: - if: '$CI_PROJECT_NAMESPACE == "compsoc1/compsoc" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' diff --git a/Committee/2023-2024/Budget/Points.md b/Committee/2023-2024/Budget/Points.md index e3f90f2..415d4de 100644 --- a/Committee/2023-2024/Budget/Points.md +++ b/Committee/2023-2024/Budget/Points.md @@ -21,9 +21,9 @@ See [last years submission][1] for more details * Minutes PDFs can be found [browse][5] [download][4] * See [Last years section][1] for guidelines -[3]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/Handovers_pdf?job=pdf +[3]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/pdf_Handovers?job=pdf [4]: https://gitlab.skynet.ie/api/v4/projects/57/jobs/artifacts/main/download?job=pdf -[5]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/Minutes_pdf?job=pdf +[5]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/pdf_Minutes?job=pdf #### Details {Add text here} diff --git a/Committee/2023-2024/Handovers/Senior_System_Administrator.md b/Committee/2023-2024/Handovers/Senior_System_Administrator.md index f46a0de..b5d9749 100644 --- a/Committee/2023-2024/Handovers/Senior_System_Administrator.md +++ b/Committee/2023-2024/Handovers/Senior_System_Administrator.md @@ -107,4 +107,4 @@ Brendan Golden. [4]: https://gitlab.skynet.ie/groups/compsoc1/compsoc/-/group_members [5]: https://renew.skynet.ie/ [6]: https://renew.skynet.ie/recovery/ -[7]: https://2016.skynet.ie/history.html \ No newline at end of file +[7]: https://2016.skynet.ie/history.html diff --git a/README.md b/README.md index 1236d59..289c326 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Latest Minutes are available here: These can be generated with ``nix run .#minutes`` [0]: https://gitlab.skynet.ie/api/v4/projects/57/jobs/artifacts/main/download?job=pdf -[1]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/Handovers_pdf?job=pdf -[2]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/Minutes_pdf?job=pdf \ No newline at end of file +[1]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/pdf_Handovers?job=pdf +[2]: https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance/-/jobs/artifacts/main/browse/pdf_Minutes?job=pdf \ No newline at end of file diff --git a/_scripts/format_budget.sh b/_scripts/format_budget.sh index 62ffe07..d1ebfba 100755 --- a/_scripts/format_budget.sh +++ b/_scripts/format_budget.sh @@ -3,8 +3,8 @@ root="$PWD" folder="Budget" -folder_html="Budget_html" -folder_pdf="Budget_pdf" +folder_html="html_${folder}" +folder_pdf="pdf_${folder}" function build_html() { # used to match ** diff --git a/_scripts/format_handovers.sh b/_scripts/format_handovers.sh index aadfe24..9603864 100755 --- a/_scripts/format_handovers.sh +++ b/_scripts/format_handovers.sh @@ -3,8 +3,8 @@ root="$PWD" folder="Handovers" -folder_html="${folder}_html" -folder_pdf="${folder}_pdf" +folder_html="html_${folder}" +folder_pdf="pdf_${folder}" function build_html() { # used to match ** diff --git a/_scripts/format_minutes.sh b/_scripts/format_minutes.sh index d6ec1ab..af0ec6f 100755 --- a/_scripts/format_minutes.sh +++ b/_scripts/format_minutes.sh @@ -2,8 +2,8 @@ root="$PWD" -folder_html="Minutes_html" -folder_pdf="Minutes_pdf" +folder_html="html_Minutes" +folder_pdf="pdf_Minutes" # make teh html files first function build_html() { diff --git a/_scripts/md_toml/_Budget.md.toml b/_scripts/md_toml/_Budget.md.toml index 560089f..13720b3 100644 --- a/_scripts/md_toml/_Budget.md.toml +++ b/_scripts/md_toml/_Budget.md.toml @@ -9,7 +9,7 @@ indentation = 2 src = "./Budget" # Optional -dest= "./Budget_html" +dest= "./html_Budget" # html blocks you dont want to include in teh finished page # Optional diff --git a/_scripts/md_toml/_Handovers.md.toml b/_scripts/md_toml/_Handovers.md.toml index 6beb670..4227cb3 100644 --- a/_scripts/md_toml/_Handovers.md.toml +++ b/_scripts/md_toml/_Handovers.md.toml @@ -9,7 +9,7 @@ indentation = 2 src = "./Handovers" # Optional -dest= "./Handovers_html" +dest= "./html_Handovers" # html blocks you dont want to include in teh finished page # Optional