Merge branch 'main' into update_member_logos

OpenAMP · Jul 22, 2024 · 1cd4091 · 1cd4091
2 parents d71307d + 3f1da01
commit 1cd4091
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Fetch git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
           path: website
@@ -28,12 +28,15 @@ jobs:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Merge test branch
-        uses: linaro-its/merge-test-branch@v2.6
+        uses: linaro-its/merge-test-branch@v2.7
         with:
           path: website
 
       - name: Build site
-        run: cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
+        run: |
+          source ~/.nvm/nvm.sh
+          nvm use 20
+          cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,15 +15,18 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Fetch git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.6
         with:
           path: website
 
       - name: Initialise environment
         run: cat "$GITHUB_WORKSPACE/website/.github-env-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Build site
-        run: cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
+        run: |
+          source ~/.nvm/nvm.sh
+          nvm use 20
+          cd ${{ github.workspace }}/website && /srv/github-action-scripts/build-astro-site.sh
 
       - name: Check links
         run: /srv/github-action-scripts/check-links.sh ${{ github.workspace }}/website/dist

diff --git a/public/docs/presentations/OpenAMP-Elevator-Pitch-2023-Q4.pdf b/public/docs/presentations/OpenAMP-Elevator-Pitch-2023-Q4.pdf
diff --git a/public/docs/presentations/OpenAMP-Elevator-Pitch-2024-Q1.pdf b/public/docs/presentations/OpenAMP-Elevator-Pitch-2024-Q1.pdf
diff --git a/public/docs/rfps/OpenAMP_DocsRFP_2024.pdf b/public/docs/rfps/OpenAMP_DocsRFP_2024.pdf
diff --git a/src/assets/images/content/Linaro-logo-white.png b/src/assets/images/content/Linaro-logo-white.png
diff --git a/src/assets/images/content/linaro-logo.png b/src/assets/images/content/linaro-logo.png
diff --git a/src/assets/images/members/Linaro-logo-black.png b/src/assets/images/members/Linaro-logo-black.png
diff --git a/src/assets/images/members/linaro-logo.png b/src/assets/images/members/linaro-logo.png
diff --git a/src/assets/linaro-logo.png b/src/assets/linaro-logo.png
diff --git a/src/assets/logo.png b/src/assets/logo.png
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
@@ -1,7 +1,7 @@
 ---
 import { getEntry } from "astro:content";
 import { Image } from "astro:assets";
-import LinaroLogo from "../assets/logo.png";
+import LinaroLogo from "../assets/images/content/Linaro-logo-white.png";
 import Icon from "astro-icon";
 
 const footer = await getEntry("data", "footer");

diff --git a/src/content/authors/linaro.yaml b/src/content/authors/linaro.yaml
diff --git a/src/content/data/members.yml b/src/content/data/members.yml
@@ -3,7 +3,7 @@
   alt: Arm Logo
   url: https://www.arm.com/
 - name: Linaro Logo
-  image: ../../assets/images/members/linaro-logo.png
+  image: ../../assets/images/members/Linaro-logo-black.png
   alt: Linaro Logo
   url: https://www.linaro.org/
 - name: Nordic Logo

diff --git a/src/content/pages/homepage.md b/src/content/pages/homepage.md
@@ -7,4 +7,4 @@ SoCs (System on a Chip) are becoming more heterogeneous, with multiple processor
 
 OpenAMP (Open Asymmetric Multi-Processing) is a framework providing the software components needed to enable the development of software applications for AMP systems. It allows operating systems to interact within a broad range of complex homogeneous and heterogeneous architectures and allows asymmetric multiprocessing applications to leverage parallelism offered by the multicore configuration.
 
-[This presentation](/docs/presentations/OpenAMP-Elevator-Pitch-2022-Q1.pdf) gives some brief details about OpenAMP.
+[This presentation](/docs/presentations/OpenAMP-Elevator-Pitch-2024-Q1.pdf) gives some brief details about OpenAMP.
diff --git a/src/content/tags/openamp.md b/src/content/tags/openamp.md
@@ -1,3 +1,3 @@
 ---
-name: OpenAPM
+name: OpenAMP
 ---