diff --git a/.github/workflows/pr-deployment.yml b/.github/workflows/pr-deployment.yml index 74cc7ec73..19f4fec22 100644 --- a/.github/workflows/pr-deployment.yml +++ b/.github/workflows/pr-deployment.yml @@ -42,7 +42,9 @@ jobs: run: | mkdir -p ${{ github.event.number }} docker image list - docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app hardware-software-interface-${{ github.event.number }}:latest + docker run -v $GITHUB_WORKSPACE/repo:/usr/src/app \ + hardware-software-interface-${{ github.event.number }}:latest bundle install + 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 diff --git a/.github/workflows/test.txt b/.github/workflows/test.txt new file mode 100644 index 000000000..f4d4e6be1 --- /dev/null +++ b/.github/workflows/test.txt @@ -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' 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-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