From 56443ebb0f57b9a639c159b0d1f7c9975366e075 Mon Sep 17 00:00:00 2001 From: goptarov Date: Sat, 26 Apr 2025 11:04:53 +0300 Subject: [PATCH 1/7] Draft lab 13 --- labs/lab-13-draft/README | 1 + 1 file changed, 1 insertion(+) create mode 100644 labs/lab-13-draft/README diff --git a/labs/lab-13-draft/README b/labs/lab-13-draft/README new file mode 100644 index 000000000..8b00e3f86 --- /dev/null +++ b/labs/lab-13-draft/README @@ -0,0 +1 @@ +Draft lab 13 for PR deployment testing From 86c0eb05cf524b785fd6b458624240f808c487b4 Mon Sep 17 00:00:00 2001 From: goptarov Date: Sat, 26 Apr 2025 11:46:38 +0300 Subject: [PATCH 2/7] deleted lab 1 conversion last task to test pr deployment --- labs/lab-01/tasks/conversions/README.md | 5 ----- labs/lab-13-draft/README | 1 - 2 files changed, 6 deletions(-) delete mode 100644 labs/lab-13-draft/README diff --git a/labs/lab-01/tasks/conversions/README.md b/labs/lab-01/tasks/conversions/README.md index e43781f0b..bc2989006 100644 --- a/labs/lab-01/tasks/conversions/README.md +++ b/labs/lab-01/tasks/conversions/README.md @@ -22,9 +22,4 @@ c. From hexadecimal to binary: - `0x5E` - `0x4A01` -d. From binary to hexadecimal: - -- `0b01111101` -- `0b1000110000011111` - If you're having difficulties solving this exercise, go through [this](../../reading/binary-hex.md) reading material. diff --git a/labs/lab-13-draft/README b/labs/lab-13-draft/README deleted file mode 100644 index 8b00e3f86..000000000 --- a/labs/lab-13-draft/README +++ /dev/null @@ -1 +0,0 @@ -Draft lab 13 for PR deployment testing From 3d64628feb908180c0a74d5a4816ed010ac217eb Mon Sep 17 00:00:00 2001 From: Cartitza Date: Wed, 7 May 2025 22:19:12 +0300 Subject: [PATCH 3/7] changed README.md in lab-09 for testing --- labs/lab-09/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/labs/lab-09/README.md b/labs/lab-09/README.md index e2756e391..4122c4ded 100644 --- a/labs/lab-09/README.md +++ b/labs/lab-09/README.md @@ -56,3 +56,6 @@ If the `git status` output differs, follow the [instructions to save your progre student@hsi:~/hardware-software-interface$ git checkout -b lab-09 main # Replace lab-09 with lab number student@hsi:~/hardware-software-interface$ git pull origin main # Get latest changes from origin/main ``` + +2. +Test \ No newline at end of file From 899e33a03849e70d86afca7076fe851f90eb35e7 Mon Sep 17 00:00:00 2001 From: Cartitza Date: Sat, 26 Apr 2025 12:45:00 +0300 Subject: [PATCH 4/7] small tweaks added to pr-deployment.yml and Gemfile to solve the bundler issue. test.yml will be deleted --- .github/workflows/pr-deployment.yml | 1 + .github/workflows/test.yml | 67 +++++++++++++++++++++++++++++ Gemfile | 1 + 3 files changed, 69 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/pr-deployment.yml b/.github/workflows/pr-deployment.yml index 74cc7ec73..05dfdd609 100644 --- a/.github/workflows/pr-deployment.yml +++ b/.github/workflows/pr-deployment.yml @@ -40,6 +40,7 @@ jobs: - name: Load Image run: | + bundle install mkdir -p ${{ github.event.number }} docker image list docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app hardware-software-interface-${{ github.event.number }}:latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..f4d4e6be1 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,67 @@ +# name: OpenEduHub - PR Deployment + +# on: +# pull_request_target: +# types: [labeled] + +# jobs: +# deploy: +# if: ${{ github.event.label.name == 'needs-rendering' }} +# name: Deploy to GitHub Pages +# runs-on: ubuntu-latest +# permissions: +# contents: write +# pull-requests: write +# steps: +# - uses: actions/checkout@v3 +# with: +# path: ./repo +# repository: ${{ github.event.pull_request.head.repo.full_name }} +# ref: ${{ github.head_ref }} + +# - run: | +# cd repo +# REF=$(echo ${{ github.event.number }} | sed 's/\//\\\//g') +# sed -i "s/baseUrl: \/operating-systems\//baseUrl: \/operating-systems\/$REF\//" config.yaml + +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v1 + +# - name: Build and push +# uses: docker/build-push-action@v3 +# with: +# context: ./repo +# file: ./repo/Dockerfile +# push: false +# load: true +# tags: operating-systems/docusaurus:latest +# cache-from: type=gha +# cache-to: type=gha + +# - name: Load Image +# run: | +# mkdir -p ${{ github.event.number }} +# docker image list +# docker run -v $GITHUB_WORKSPACE/repo:/content -v $GITHUB_WORKSPACE/${{ github.event.number }}:/output operating-systems/docusaurus:latest + +# # Popular action to deploy to GitHub Pages: +# # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus +# - name: Deploy to GitHub Pages +# uses: peaceiris/actions-gh-pages@v3 +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# # Build output to publish to the `gh-pages-pr` branch: +# publish_dir: ./${{ github.event.number }} +# destination_dir: ${{ github.event.number }} +# # The following lines assign commit authorship to the official +# # GH-Actions bot for deploys to `gh-pages` branch: +# # https://github.com/actions/checkout/issues/13#issuecomment-724415212 +# # The GH actions bot is used by default if you didn't specify the two fields. +# # You can swap them out with your own user credentials. +# publish_branch: gh-pages + +# - name: Add Comment to PR +# uses: thollander/actions-comment-pull-request@v2 +# with: +# message: | +# Published at https://${{ github.repository_owner }}.github.io/operating-systems/${{ github.event.number }}/ \ No newline at end of file diff --git a/Gemfile b/Gemfile index 34f6cecb6..25fb07faa 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" source 'https://rubygems.org' +gem 'jekyll' gem 'jekyll-titles-from-headings' gem 'jekyll-seo-tag' gem 'just-the-docs', git: 'https://github.com/just-the-docs/just-the-docs' From a19e34dd460ad52d0f376891cb6dbd30a1664676 Mon Sep 17 00:00:00 2001 From: Cartitza Date: Sat, 26 Apr 2025 12:50:43 +0300 Subject: [PATCH 5/7] renamed test.yml to test.txt --- .github/workflows/{test.yml => test.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test.yml => test.txt} (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.txt similarity index 100% rename from .github/workflows/test.yml rename to .github/workflows/test.txt From b782d92e93ad9c7ac2fd911e668851f09c7a2935 Mon Sep 17 00:00:00 2001 From: Cartitza Date: Wed, 7 May 2025 22:14:05 +0300 Subject: [PATCH 6/7] small change to pr-deployment, pushed for testing --- .github/workflows/pr-deployment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-deployment.yml b/.github/workflows/pr-deployment.yml index 05dfdd609..bd8ad2e5f 100644 --- a/.github/workflows/pr-deployment.yml +++ b/.github/workflows/pr-deployment.yml @@ -40,9 +40,10 @@ jobs: - name: Load Image run: | - bundle install mkdir -p ${{ github.event.number }} docker image list + docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app \ + hardware-software-interface-${{ github.event.number }}:latest bundle install docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app hardware-software-interface-${{ github.event.number }}:latest # Popular action to deploy to GitHub Pages: From 8e43500473295e5a11c2ce44c86a7ae775c59f08 Mon Sep 17 00:00:00 2001 From: Cartitza Date: Sat, 10 May 2025 20:52:58 +0300 Subject: [PATCH 7/7] changed the docker run command to detached --- .github/workflows/pr-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-deployment.yml b/.github/workflows/pr-deployment.yml index bd8ad2e5f..19f4fec22 100644 --- a/.github/workflows/pr-deployment.yml +++ b/.github/workflows/pr-deployment.yml @@ -44,7 +44,7 @@ jobs: docker image list docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app \ hardware-software-interface-${{ github.event.number }}:latest bundle install - docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app hardware-software-interface-${{ github.event.number }}:latest + docker run -d -v $GITHUB_WORKSPACE/repo:/usr/src/app hardware-software-interface-${{ github.event.number }}:latest # Popular action to deploy to GitHub Pages: # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus