diff --git a/.github/workflows/build-api.yml b/.github/workflows/build-api.yml index 41e858e3..cce681b9 100644 --- a/.github/workflows/build-api.yml +++ b/.github/workflows/build-api.yml @@ -5,7 +5,7 @@ on: push: paths: - practicals/button/spec.yml - - tutorials/chatterbox/spec.yml + - studies/chatterbox/spec.yml jobs: build-cloud: @@ -26,7 +26,7 @@ jobs: uses: openapi-generators/openapitools-generator-action@v1 with: generator: html2 - openapi-file: ./tutorials/chatterbox/spec.yml + openapi-file: ./studies/chatterbox/spec.yml command-args: --output ./dist/api/chatterbox --template-dir ./assessment/cloud/docs-template - name: Upload APIs diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index eff2fe78..12725622 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -7,7 +7,7 @@ on: - Build Assessment - Build Notes - Build Practicals - - Build Tutorials + - Build Studies - Build Slides - Build Cloud Assignment Requirements - Build OpenAPI Docs @@ -46,15 +46,15 @@ jobs: - run: cp -r ./practicals/practicals/practicals ./public - - name: Download tutorials + - name: Download studies uses: dawidd6/action-download-artifact@v2 with: - workflow: build-tutorials.yml + workflow: build-studies.yml workflow_conclusion: success branch: main - path: tutorials + path: studies - - run: cp -r ./tutorials/tutorials/tutorials ./public + - run: cp -r ./studies/studies/studies ./public - name: Download slides uses: dawidd6/action-download-artifact@v2 diff --git a/.github/workflows/build-tutorials.yml b/.github/workflows/build-studies.yml similarity index 77% rename from .github/workflows/build-tutorials.yml rename to .github/workflows/build-studies.yml index 4a0cf63c..7ed6ce7f 100644 --- a/.github/workflows/build-tutorials.yml +++ b/.github/workflows/build-studies.yml @@ -1,13 +1,13 @@ -name: Build Tutorials +name: Build Studies on: workflow_dispatch: push: paths: - - tutorials/** + - studies/** jobs: - build-tutorials: + build-studies: runs-on: ubuntu-latest container: texlive/texlive:latest @@ -23,13 +23,13 @@ jobs: - name: Correct last modified run: ./.github/workflows/set-last-updated.sh - - name: Compile Tutorials - run: ./bin/build_tutorials.sh + - name: Compile studies + run: ./bin/build_studies.sh - name: Upload Slides uses: actions/upload-artifact@v3 with: - name: tutorials + name: studies path: | ./dist/**/* diff --git a/bin/build_tutorials.sh b/bin/build_studies.sh similarity index 91% rename from bin/build_tutorials.sh rename to bin/build_studies.sh index 1355bb9e..73a7ee77 100755 --- a/bin/build_tutorials.sh +++ b/bin/build_studies.sh @@ -2,11 +2,11 @@ REPO_ROOT=$(git rev-parse --show-toplevel) -DIST_DIR="${REPO_ROOT}/dist/tutorials" +DIST_DIR="${REPO_ROOT}/dist/studies" mkdir -p "${REPO_ROOT}/dist" mkdir -p "${DIST_DIR}" -for folder in ${REPO_ROOT}/tutorials/*; do +for folder in ${REPO_ROOT}/studies/*; do echo $folder if [[ -f "${folder}/latexmkrc" ]]; then pushd $folder; diff --git a/public/schedule/index.html b/public/schedule/index.html index 3ce55d8a..6ed3c595 100644 --- a/public/schedule/index.html +++ b/public/schedule/index.html @@ -119,9 +119,9 @@
Readings from Software Architecture in Practice 4th
  • Chapter 3
    • -
    Tutorial
    +
    Case Study Session
    - No tutorial this week.

    + No Case Study Session this week.

    Practical @@ -228,8 +228,8 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 19
    • -
    Tutorial - +
    Case Study Session + Brief
    @@ -309,8 +309,8 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 16
    • -
    Tutorial - +
    Case Study Session + Brief
    @@ -393,8 +393,8 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 17
    • -
    Tutorial - +
    Case Study Session + Brief @@ -484,8 +484,8 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 21
    • -
    Tutorial - +
    Case Study Session + Brief
    @@ -563,7 +563,7 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 22
    • -
    Tutorial +
    Case Study Session Specification @@ -589,7 +589,7 @@
    Practical
    Assessment
      -
    • Show draft architecture model of your case study in tutorial.
      • +
    • Show draft architecture model of your case study in Case Study Session.
    • Project proposal due next week.
    @@ -643,8 +643,8 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 20
    • -
    Tutorial - +
    Case Study Session + Brief
    @@ -718,7 +718,7 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 10
    • -
    Tutorial
    +
    Case Study Session
    Monitoring & Logging

    @@ -774,7 +774,7 @@
    Readings from Software Architecture in Practice 4th
  • Chapter 12
    • -
    Tutorial
    +
    Case Study Session
    Assignment Q&A Session

    @@ -829,8 +829,8 @@
    Topics
    -
    Tutorial - +
    Case Study Session + Brief
    @@ -898,7 +898,7 @@
    Topics

    -
    Tutorial +
    Case Study Session
    -
    Tutorial
    - +
    Case Study Session
    +     Brief @@ -1042,9 +1042,9 @@
    Topics

    -
    Tutorial
    +
    Case Study Session
    - There is no tutorial in week 13.

    + There is no Case Study Session in week 13.

    Practical
    diff --git a/slides/overview/main.tex b/slides/overview/main.tex index 13aac4ee..640598da 100644 --- a/slides/overview/main.tex +++ b/slides/overview/main.tex @@ -38,7 +38,7 @@ \item Learn the principles for working with \highlight{distributed systems}. \end{itemize} -{\color{pine} Tutorials} +{\color{pine} Studies} \begin{itemize}[<+->] \item Work on \highlight{case studies} that implement architectual patterns. \item Hands-on practice with the tools and techniques for \highlight{designing} and \highlight{implementing} software systems. diff --git a/tutorials/chatterbox/latexmkrc b/studies/chatterbox/latexmkrc similarity index 100% rename from tutorials/chatterbox/latexmkrc rename to studies/chatterbox/latexmkrc diff --git a/tutorials/chatterbox/main.tex b/studies/chatterbox/main.tex similarity index 100% rename from tutorials/chatterbox/main.tex rename to studies/chatterbox/main.tex diff --git a/tutorials/chatterbox/spec.yml b/studies/chatterbox/spec.yml similarity index 100% rename from tutorials/chatterbox/spec.yml rename to studies/chatterbox/spec.yml diff --git a/tutorials/coffee/coffee.bib b/studies/coffee/coffee.bib similarity index 100% rename from tutorials/coffee/coffee.bib rename to studies/coffee/coffee.bib diff --git a/tutorials/coffee/docs/container.puml b/studies/coffee/docs/container.puml similarity index 100% rename from tutorials/coffee/docs/container.puml rename to studies/coffee/docs/container.puml diff --git a/tutorials/coffee/docs/context.puml b/studies/coffee/docs/context.puml similarity index 100% rename from tutorials/coffee/docs/context.puml rename to studies/coffee/docs/context.puml diff --git a/tutorials/coffee/latexmkrc b/studies/coffee/latexmkrc similarity index 100% rename from tutorials/coffee/latexmkrc rename to studies/coffee/latexmkrc diff --git a/tutorials/coffee/main.tex b/studies/coffee/main.tex similarity index 100% rename from tutorials/coffee/main.tex rename to studies/coffee/main.tex diff --git a/tutorials/containers/code/Dockerfile b/studies/containers/code/Dockerfile similarity index 100% rename from tutorials/containers/code/Dockerfile rename to studies/containers/code/Dockerfile diff --git a/tutorials/containers/code/hextris.Dockerfile b/studies/containers/code/hextris.Dockerfile similarity index 100% rename from tutorials/containers/code/hextris.Dockerfile rename to studies/containers/code/hextris.Dockerfile diff --git a/tutorials/containers/latexmkrc b/studies/containers/latexmkrc similarity index 100% rename from tutorials/containers/latexmkrc rename to studies/containers/latexmkrc diff --git a/tutorials/containers/main.tex b/studies/containers/main.tex similarity index 100% rename from tutorials/containers/main.tex rename to studies/containers/main.tex diff --git a/tutorials/devops/latexmkrc b/studies/devops/latexmkrc similarity index 100% rename from tutorials/devops/latexmkrc rename to studies/devops/latexmkrc diff --git a/tutorials/devops/main.tex b/studies/devops/main.tex similarity index 100% rename from tutorials/devops/main.tex rename to studies/devops/main.tex diff --git a/tutorials/devops/resources.txt b/studies/devops/resources.txt similarity index 100% rename from tutorials/devops/resources.txt rename to studies/devops/resources.txt diff --git a/tutorials/eventual-broker/latexmkrc b/studies/eventual-broker/latexmkrc similarity index 100% rename from tutorials/eventual-broker/latexmkrc rename to studies/eventual-broker/latexmkrc diff --git a/tutorials/eventual-broker/main.tex b/studies/eventual-broker/main.tex similarity index 100% rename from tutorials/eventual-broker/main.tex rename to studies/eventual-broker/main.tex diff --git a/tutorials/eventual-broker/references.bib b/studies/eventual-broker/references.bib similarity index 100% rename from tutorials/eventual-broker/references.bib rename to studies/eventual-broker/references.bib diff --git a/tutorials/microforecast/MicroForecast.asta b/studies/microforecast/MicroForecast.asta similarity index 100% rename from tutorials/microforecast/MicroForecast.asta rename to studies/microforecast/MicroForecast.asta diff --git a/tutorials/microforecast/c4_model/workspace.dsl b/studies/microforecast/c4_model/workspace.dsl similarity index 100% rename from tutorials/microforecast/c4_model/workspace.dsl rename to studies/microforecast/c4_model/workspace.dsl diff --git a/tutorials/microforecast/c4_model/workspace.json b/studies/microforecast/c4_model/workspace.json similarity index 100% rename from tutorials/microforecast/c4_model/workspace.json rename to studies/microforecast/c4_model/workspace.json diff --git a/tutorials/microforecast/latexmkrc b/studies/microforecast/latexmkrc similarity index 100% rename from tutorials/microforecast/latexmkrc rename to studies/microforecast/latexmkrc diff --git a/tutorials/microforecast/main.tex b/studies/microforecast/main.tex similarity index 100% rename from tutorials/microforecast/main.tex rename to studies/microforecast/main.tex diff --git a/tutorials/pipelines/diagram.pdf b/studies/pipelines/diagram.pdf similarity index 100% rename from tutorials/pipelines/diagram.pdf rename to studies/pipelines/diagram.pdf diff --git a/tutorials/pipelines/latexmkrc b/studies/pipelines/latexmkrc similarity index 100% rename from tutorials/pipelines/latexmkrc rename to studies/pipelines/latexmkrc diff --git a/tutorials/pipelines/main.tex b/studies/pipelines/main.tex similarity index 100% rename from tutorials/pipelines/main.tex rename to studies/pipelines/main.tex diff --git a/tutorials/pipelines/sample.tex b/studies/pipelines/sample.tex similarity index 100% rename from tutorials/pipelines/sample.tex rename to studies/pipelines/sample.tex diff --git a/tutorials/ticketoverflow/images/bucket-queue.png b/studies/ticketoverflow/images/bucket-queue.png similarity index 100% rename from tutorials/ticketoverflow/images/bucket-queue.png rename to studies/ticketoverflow/images/bucket-queue.png diff --git a/tutorials/ticketoverflow/images/staging-queue.png b/studies/ticketoverflow/images/staging-queue.png similarity index 100% rename from tutorials/ticketoverflow/images/staging-queue.png rename to studies/ticketoverflow/images/staging-queue.png diff --git a/tutorials/ticketoverflow/latexmkrc b/studies/ticketoverflow/latexmkrc similarity index 100% rename from tutorials/ticketoverflow/latexmkrc rename to studies/ticketoverflow/latexmkrc diff --git a/tutorials/ticketoverflow/main.tex b/studies/ticketoverflow/main.tex similarity index 100% rename from tutorials/ticketoverflow/main.tex rename to studies/ticketoverflow/main.tex diff --git a/tutorials/ticketoverflow/resources/deployment.puml b/studies/ticketoverflow/resources/deployment.puml similarity index 100% rename from tutorials/ticketoverflow/resources/deployment.puml rename to studies/ticketoverflow/resources/deployment.puml diff --git a/tutorials/ticketoverflow/resources/ticketoverflow.png b/studies/ticketoverflow/resources/ticketoverflow.png similarity index 100% rename from tutorials/ticketoverflow/resources/ticketoverflow.png rename to studies/ticketoverflow/resources/ticketoverflow.png diff --git a/tutorials/troubleshooting/latexmkrc b/studies/troubleshooting/latexmkrc similarity index 100% rename from tutorials/troubleshooting/latexmkrc rename to studies/troubleshooting/latexmkrc diff --git a/tutorials/troubleshooting/main.tex b/studies/troubleshooting/main.tex similarity index 100% rename from tutorials/troubleshooting/main.tex rename to studies/troubleshooting/main.tex diff --git a/tutorials/ylearn/c4-model/docs/disclaimer.md b/studies/ylearn/c4-model/docs/disclaimer.md similarity index 100% rename from tutorials/ylearn/c4-model/docs/disclaimer.md rename to studies/ylearn/c4-model/docs/disclaimer.md diff --git a/tutorials/ylearn/c4-model/workspace.dsl b/studies/ylearn/c4-model/workspace.dsl similarity index 100% rename from tutorials/ylearn/c4-model/workspace.dsl rename to studies/ylearn/c4-model/workspace.dsl diff --git a/tutorials/ylearn/c4-model/workspace.json b/studies/ylearn/c4-model/workspace.json similarity index 100% rename from tutorials/ylearn/c4-model/workspace.json rename to studies/ylearn/c4-model/workspace.json diff --git a/tutorials/ylearn/images/container.png b/studies/ylearn/images/container.png similarity index 100% rename from tutorials/ylearn/images/container.png rename to studies/ylearn/images/container.png diff --git a/tutorials/ylearn/images/context.png b/studies/ylearn/images/context.png similarity index 100% rename from tutorials/ylearn/images/context.png rename to studies/ylearn/images/context.png diff --git a/tutorials/ylearn/images/deployment.png b/studies/ylearn/images/deployment.png similarity index 100% rename from tutorials/ylearn/images/deployment.png rename to studies/ylearn/images/deployment.png diff --git a/tutorials/ylearn/latexmkrc b/studies/ylearn/latexmkrc similarity index 100% rename from tutorials/ylearn/latexmkrc rename to studies/ylearn/latexmkrc diff --git a/tutorials/ylearn/main.tex b/studies/ylearn/main.tex similarity index 100% rename from tutorials/ylearn/main.tex rename to studies/ylearn/main.tex