Merge branch 'ArmDeveloperEcosystem:main' into main

Author: stephentheobald-arm

.devcontainer/Dockerfile

@@ -1,13 +1,16 @@
 FROM ubuntu:latest
 
-ARG HUGO=hugo_0.111.2_linux-amd64
-ARG HUGO_VER=v0.111.2
+ARG TARGETPLATFORM
 
-# general setup
 RUN apt-get update && \
     apt-get -y install vim wget sudo git 
 
-RUN wget https://github.com/gohugoio/hugo/releases/download/$HUGO_VER/$HUGO.deb && apt-get -y install ./$HUGO.deb
+RUN case ${TARGETPLATFORM} in \
+         "linux/amd64")  HUGO=hugo_0.111.2_linux-amd64 ;; \
+         "linux/arm64")  HUGO=hugo_0.111.2_linux-arm64 ;; \
+    esac \
+    && HUGO_VER=v0.111.2 \
+    &&  wget https://github.com/gohugoio/hugo/releases/download/${HUGO_VER}/${HUGO}.deb && apt-get -y install ./${HUGO}.deb
 
 # User account
 ENV USER=ubuntu

.devcontainer/build-dev-container.sh

@@ -0,0 +1,12 @@
+docker build --platform linux/amd64 -t armswdev/learn-dev-container:amd64 .
+docker build --platform linux/arm64 -t armswdev/learn-dev-container:arm64 .
+
+docker push armswdev/learn-dev-container:amd64
+docker push armswdev/learn-dev-container:arm64
+
+docker manifest create armswdev/learn-dev-container:latest \
+--amend armswdev/learn-dev-container:arm64 \
+--amend armswdev/learn-dev-container:amd64
+
+docker manifest push --purge armswdev/learn-dev-container:latest
+

.devcontainer/devcontainer.json

@@ -1,14 +1,12 @@
 {
     "name": "Arm Learning Paths",
 
-    "build": {
-        "dockerfile": "Dockerfile"
-    },
+    "image": "docker.io/armswdev/learn-dev-container:latest",
 
     "forwardPorts": [1313],
 
     "remoteUser": "ubuntu",
 
-    "postStartCommand": "nohup bash -c 'hugo server --baseUrl=/ --liveReloadPort=443 --appendPort=false --bind=0.0.0.0 &' "
+    "postStartCommand": "nohup bash -c 'hugo ; bin/pagefind --site public --output-subdir ../static/pagefind ; hugo server --baseUrl=/ --liveReloadPort=443 --appendPort=false --bind=0.0.0.0 &' "
 
 }

.github/workflows/content-checks.yml

@@ -26,7 +26,9 @@ jobs:
           extended: true
 
       - name: Build
-        run: hugo --minify
+        run: |
+          hugo --minify
+          bin/pagefind --site "public"
 
       - name: Check HTML links
         continue-on-error: true

.github/workflows/deploy.yml

@@ -38,7 +38,9 @@ jobs:
 
       # Builds arm-learning-paths repo
       - name: Build
-        run: hugo --minify
+        run: |
+          hugo --minify
+          bin/pagefind --site "public"
         
       #  Copy SSH Key
       - name: copy key

.github/workflows/main.yml

@@ -39,7 +39,9 @@ jobs:
 
       # Builds arm-software-developer repo
       - name: Build
-        run: hugo --minify
+        run: |
+          hugo --minify
+          bin/pagefind --site "public"
 
       # Deploys website to AWS S3
       - name: Deploy to S3

.github/workflows/maintenance.yml

@@ -17,7 +17,6 @@ jobs:
   report:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Check out repo and the whole history
@@ -29,7 +28,7 @@ jobs:
       # Report outdated files, store result as artifact and updates stats
       - name: Report outdated files of more than 20 days
         run: |
-           pip install junit-xml
+           pip install -r tools/requirements.txt
            python3 tools/maintenance.py -r 20
 
       # Upload report as artifact
@@ -66,11 +65,11 @@ jobs:
           done
            
       # Run tests for learning paths
-      - name: Test commands and output reports for learning paths
-        run: |
-          for i in $(tree -i -d -f content/learning-paths/ | tail -n +2); do
-            python3 tools/maintenance.py -i $i -l ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          done
+      #- name: Test commands and output reports for learning paths
+      #  run: |
+      #    for i in $(tree -i -d -f content/learning-paths/ | tail -n +2); do
+      #      python3 tools/maintenance.py -i $i -l ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      #    done
 
       # Move reports to result folder
       - name: Move reports

.gitignore

@@ -1,8 +1,10 @@
 /public
+/static/
+__pycache__/
 resources/
 node_modules/
 package-lock.json
 .hugo_build.lock
 
 # macOS files
-*.DS_Store
+*.DS_Store

.gitpod.yml

@@ -2,7 +2,10 @@ tasks:
   - name: Install Hugo
     before: brew install hugo
     init: echo "Your version of Hugo is `hugo version`"
-    command: hugo server -D -F --baseURL $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
+    command: |
+        hugo
+        bin/pagefind --site "public" --output-subdir ../static/pagefind
+        hugo server -D -F --baseURL $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
 
 ports:
   - port: 1313