From 373e2656302f2a08fc9473ed8bc230d6195d0758 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 11 Feb 2026 11:56:31 -0800 Subject: [PATCH 01/21] img and ecosystem-dashboard routing fix --- content/linux/_index.md | 2 +- content/windows/_index.md | 2 +- themes/arm-design-system-hugo-theme/layouts/index.html | 2 +- .../layouts/partials/eco-dashboard/info-top.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/linux/_index.md b/content/linux/_index.md index 4754d2f30c..ac16b39118 100644 --- a/content/linux/_index.md +++ b/content/linux/_index.md @@ -3,5 +3,5 @@ title: Cloud Software Ecosystem Dashboard for Arm os: Linux backgroundColor: 3c5610 # green textColor: 95D629 # DBFF89 # green -logo: /img/LinuxLogo.svg +logo: img/LinuxLogo.svg --- \ No newline at end of file diff --git a/content/windows/_index.md b/content/windows/_index.md index 55b6926fac..b81a151526 100644 --- a/content/windows/_index.md +++ b/content/windows/_index.md @@ -3,5 +3,5 @@ title: Windows on Arm Software Dashboard os: Windows backgroundColor: 002B49 # blue textColor: 92D2FF # light blue -logo: /img/WindowsLogo.svg +logo: img/WindowsLogo.svg --- \ No newline at end of file diff --git a/themes/arm-design-system-hugo-theme/layouts/index.html b/themes/arm-design-system-hugo-theme/layouts/index.html index 433a05e2be..bdc82d4504 100644 --- a/themes/arm-design-system-hugo-theme/layouts/index.html +++ b/themes/arm-design-system-hugo-theme/layouts/index.html @@ -14,7 +14,7 @@
diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 339cb60f8d..e812f482e4 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -24,10 +24,10 @@
- OS Logo + OS Logo
- OS Logo + OS Logo
From cf2f6d3828c7c6a3237803d2165ecdecf5a5c880 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 11 Feb 2026 12:02:59 -0800 Subject: [PATCH 02/21] new yml for staging --- .github/workflows/staging-content-deploy.yml | 67 ++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/staging-content-deploy.yml diff --git a/.github/workflows/staging-content-deploy.yml b/.github/workflows/staging-content-deploy.yml new file mode 100644 index 0000000000..d0ddb05c5a --- /dev/null +++ b/.github/workflows/staging-content-deploy.yml @@ -0,0 +1,67 @@ +# This is a basic workflow to help you get started with Actions + +name: staging-content-deploy + +# Controls when the workflow will run +on: + # Triggers the workflow on push to production branch + push: + branches: [ production ] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build_and_deploy: + # 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: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + with: + submodules: true # Fetch Hugo Themes + fetch-depth: 0 + + # Sets Up Hugo + - name: Setup Hugo + uses: peaceiris/actions-hugo@v2 + with: + hugo-version: '0.98.0' + extended: true + + # Post-CSS install + - name: Install Post-CSS + run: npm install postcss-cli + + # Builds ecosystem-dashboard-for-arm repo + - name: Build + run: | + export HUGO_PRODUCTION=true + hugo --minify + + + # Copy SSH Key + - name: copy key + run: | + echo $SSH_KEY | xargs -n 1 > tmpkey + base64 -d < tmpkey > key + chmod 400 key + shell: bash + env: + SSH_KEY: ${{secrets.SSH_KEY}} + + # SCP Site contents to netstorage + - name: copy site content + run: | + cd public + zip -r dev-public.zip . + cd .. + scp -i key -o StrictHostKeyChecking=accept-new -oHostKeyAlgorithms=+ssh-dss -r public/dev-public.zip $USR@$HOST:/$ID/ + shell: bash + env: + USR: ${{secrets.SSH_USERNAME}} + HOST: ${{secrets.SSH_HOST}} + ID: ${{secrets.ID}} From df986f04b3179728fab6b9b907265fd2d964999c Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 10:04:16 -0800 Subject: [PATCH 03/21] fixes for routing in developer.arm --- .../partials/eco-dashboard/info-top.html | 6 +++--- .../partials/footer/script-includes.html | 20 +++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index e812f482e4..6627d968b8 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -39,9 +39,9 @@ // Add event listener on click of switch-dashboards ads-cta button to navigate to appropriate dashboard document.getElementById('switch-dashboards').addEventListener('click', function() { {{if eq .Params.os "Linux"}} - window.location.href = '{{ "/windows/" | relURL }}'; + window.location.href = '{{ "windows/" | relURL }}'; {{else if eq .Params.os "Windows"}} - window.location.href = '{{ "/linux/" | relURL }}'; + window.location.href = '{{ "linux/" | relURL }}'; {{else}} {{end}} @@ -51,4 +51,4 @@ window.open('{{printf "%s/%s" site.Params.github_repo "#readme"}}', '_blank'); }); - \ No newline at end of file + diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/footer/script-includes.html b/themes/arm-design-system-hugo-theme/layouts/partials/footer/script-includes.html index eb8c1e7938..7fc9811221 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/footer/script-includes.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/footer/script-includes.html @@ -1,8 +1,20 @@ - - - - +{{- $js_search := "js/eco-dashboard/search.js" -}} +{{- $js_table := "js/eco-dashboard/table_functionality.js" -}} +{{- $js_mobile := "js/eco-dashboard/filter-and-navigate-mobile-behavior.js" -}} +{{- $js_analytics := "js/anonymous-analytics.js" -}} + +{{- if eq (getenv "HUGO_PRODUCTION") "true" -}} + + + + +{{- else -}} + + + + +{{- end -}} From 2b5b77a34fafa7d82aa62c8e6435bb9122763eb2 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 10:27:49 -0800 Subject: [PATCH 04/21] layout and logo not rendering in dev.developer fixes --- .../layouts/partials/eco-dashboard/info-top.html | 12 ++++++++++-- .../layouts/partials/head/head.html | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 6627d968b8..6e9bcba9fe 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -24,10 +24,18 @@
- OS Logo + {{- $logo_src := .Params.logo | absURL -}} + {{- if eq .Site.BaseURL "/" -}} + {{- $logo_src = printf "/ecosystem-dashboard/%s" .Params.logo -}} + {{- end -}} + OS Logo
- OS Logo + {{- $logo_src := .Params.logo | absURL -}} + {{- if eq .Site.BaseURL "/" -}} + {{- $logo_src = printf "/ecosystem-dashboard/%s" .Params.logo -}} + {{- end -}} + OS Logo
diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html index efecaf71ee..442741589b 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html @@ -13,8 +13,8 @@ {{ $css_file_location := $css_home.Permalink}} -{{/* ONLY INCLUDE THIS BASE URL IF PUSHING TO PRODUCTION SERVER. OTHERWISE, IGNORE */}} -{{- if eq (getenv "HUGO_PRODUCTION") "true" -}} +{{/* ONLY INCLUDE THIS BASE URL IF PUSHING TO PRODUCTION SERVER OR BASEURL POINTS TO ECOSYSTEM-DASHBOARD */}} +{{- if or (eq (getenv "HUGO_PRODUCTION") "true") (in .Site.BaseURL "developer.arm.com/ecosystem-dashboard") -}} {{/* CSS file update to without leading slash */}} From 2eea4201d0e486b9a310971e49c28bfe4c01901f Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 10:43:26 -0800 Subject: [PATCH 05/21] extra fix 404 stylesheet --- .../layouts/partials/head/head.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html index 442741589b..0a1a95d5f4 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html @@ -15,7 +15,11 @@ {{/* ONLY INCLUDE THIS BASE URL IF PUSHING TO PRODUCTION SERVER OR BASEURL POINTS TO ECOSYSTEM-DASHBOARD */}} {{- if or (eq (getenv "HUGO_PRODUCTION") "true") (in .Site.BaseURL "developer.arm.com/ecosystem-dashboard") -}} - + {{- $base_href := .Site.BaseURL -}} + {{- if eq $base_href "/" -}} + {{- $base_href = "/ecosystem-dashboard/" -}} + {{- end -}} + {{/* CSS file update to without leading slash */}} {{ $css_file_location = trim $css_home.Permalink "/"}} From b5bd09c70b434460d3c890b120bc7781e9733373 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 10:52:03 -0800 Subject: [PATCH 06/21] another fix to fix windows on arm software dashboard button --- .../layouts/partials/eco-dashboard/info-top.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 6e9bcba9fe..0fa28df02d 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -47,9 +47,17 @@ // Add event listener on click of switch-dashboards ads-cta button to navigate to appropriate dashboard document.getElementById('switch-dashboards').addEventListener('click', function() { {{if eq .Params.os "Linux"}} - window.location.href = '{{ "windows/" | relURL }}'; + {{- $target := "windows/" | absURL -}} + {{- if eq .Site.BaseURL "/" -}} + {{- $target = "/ecosystem-dashboard/windows/" -}} + {{- end -}} + window.location.href = '{{ $target }}'; {{else if eq .Params.os "Windows"}} - window.location.href = '{{ "linux/" | relURL }}'; + {{- $target := "linux/" | absURL -}} + {{- if eq .Site.BaseURL "/" -}} + {{- $target = "/ecosystem-dashboard/linux/" -}} + {{- end -}} + window.location.href = '{{ $target }}'; {{else}} {{end}} From 651e783680a4382420965c665ca240a341ad66ab Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 12:00:26 -0800 Subject: [PATCH 07/21] leading slash issue --- .../layouts/partials/eco-dashboard/info-top.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 0fa28df02d..974e57d356 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -47,15 +47,15 @@ // Add event listener on click of switch-dashboards ads-cta button to navigate to appropriate dashboard document.getElementById('switch-dashboards').addEventListener('click', function() { {{if eq .Params.os "Linux"}} - {{- $target := "windows/" | absURL -}} + {{- $target := "windows" | absURL -}} {{- if eq .Site.BaseURL "/" -}} - {{- $target = "/ecosystem-dashboard/windows/" -}} + {{- $target = "/ecosystem-dashboard/windows" -}} {{- end -}} window.location.href = '{{ $target }}'; {{else if eq .Params.os "Windows"}} - {{- $target := "linux/" | absURL -}} + {{- $target := "linux" | absURL -}} {{- if eq .Site.BaseURL "/" -}} - {{- $target = "/ecosystem-dashboard/linux/" -}} + {{- $target = "/ecosystem-dashboard/linux" -}} {{- end -}} window.location.href = '{{ $target }}'; {{else}} From 1124540543d498ce6bbf8854a36a0c28349408aa Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 12:26:22 -0800 Subject: [PATCH 08/21] second leading / fix --- .../layouts/partials/eco-dashboard/info-top.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 974e57d356..46299baf9b 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -47,17 +47,17 @@ // Add event listener on click of switch-dashboards ads-cta button to navigate to appropriate dashboard document.getElementById('switch-dashboards').addEventListener('click', function() { {{if eq .Params.os "Linux"}} - {{- $target := "windows" | absURL -}} - {{- if eq .Site.BaseURL "/" -}} - {{- $target = "/ecosystem-dashboard/windows" -}} + {{- $base := .Site.BaseURL | strings.TrimRight "/" -}} + {{- if eq $base "" -}} + {{- $base = "/ecosystem-dashboard" -}} {{- end -}} - window.location.href = '{{ $target }}'; + window.location.href = '{{ printf "%s/windows" $base }}'; {{else if eq .Params.os "Windows"}} - {{- $target := "linux" | absURL -}} - {{- if eq .Site.BaseURL "/" -}} - {{- $target = "/ecosystem-dashboard/linux" -}} + {{- $base := .Site.BaseURL | strings.TrimRight "/" -}} + {{- if eq $base "" -}} + {{- $base = "/ecosystem-dashboard" -}} {{- end -}} - window.location.href = '{{ $target }}'; + window.location.href = '{{ printf "%s/linux" $base }}'; {{else}} {{end}} From 469cebd9a7d7c1fec14b8d12f6286b88dc71a9de Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:06:49 -0800 Subject: [PATCH 09/21] test change for cloudfront routing --- config.toml | 3 +- .../partials/eco-dashboard/info-top.html | 30 +++++++++++++++---- .../layouts/partials/head/head.html | 7 ++++- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/config.toml b/config.toml index 308ac81ba4..28ddfd5a75 100644 --- a/config.toml +++ b/config.toml @@ -24,6 +24,7 @@ cloudFrontDistributionID = "EBSHXJ6P4DYP8" [params] # location of assets assetsDir = "assets" +dashboard_base_path = "/ecosystem-dashboard" # Repository configuration (URLs for in-page links to opening issues and suggesting changes) github_repo = "https://github.com/ArmDeveloperEcosystem/ecosystem-dashboard-for-arm" @@ -33,4 +34,4 @@ arm_url = "https://developer.arm.com/ecosystem-dashboard/" title = 'Software Ecosystem Dashboard for Arm' description = 'Discover what software packages work on Arm servers and how to get started. A great resource for migrating to Arm.' social_image = '/ecosystem-dashboard/img/social-image.jpg' -twitter_handle = '@ArmSoftwareDev' \ No newline at end of file +twitter_handle = '@ArmSoftwareDev' diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html index 46299baf9b..274f16ae4a 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/eco-dashboard/info-top.html @@ -26,14 +26,24 @@
{{- $logo_src := .Params.logo | absURL -}} {{- if eq .Site.BaseURL "/" -}} - {{- $logo_src = printf "/ecosystem-dashboard/%s" .Params.logo -}} + {{- $base_path := (.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" -}} + {{- if eq $base_path "" -}} + {{- $logo_src = printf "/%s" .Params.logo -}} + {{- else -}} + {{- $logo_src = printf "%s/%s" $base_path .Params.logo -}} + {{- end -}} {{- end -}} OS Logo
{{- $logo_src := .Params.logo | absURL -}} {{- if eq .Site.BaseURL "/" -}} - {{- $logo_src = printf "/ecosystem-dashboard/%s" .Params.logo -}} + {{- $base_path := (.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" -}} + {{- if eq $base_path "" -}} + {{- $logo_src = printf "/%s" .Params.logo -}} + {{- else -}} + {{- $logo_src = printf "%s/%s" $base_path .Params.logo -}} + {{- end -}} {{- end -}} OS Logo
@@ -49,15 +59,23 @@ {{if eq .Params.os "Linux"}} {{- $base := .Site.BaseURL | strings.TrimRight "/" -}} {{- if eq $base "" -}} - {{- $base = "/ecosystem-dashboard" -}} + {{- $base = (.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" -}} + {{- end -}} + {{- if eq $base "" -}} + window.location.href = '/windows'; + {{- else -}} + window.location.href = '{{ printf "%s/windows" $base }}'; {{- end -}} - window.location.href = '{{ printf "%s/windows" $base }}'; {{else if eq .Params.os "Windows"}} {{- $base := .Site.BaseURL | strings.TrimRight "/" -}} {{- if eq $base "" -}} - {{- $base = "/ecosystem-dashboard" -}} + {{- $base = (.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" -}} + {{- end -}} + {{- if eq $base "" -}} + window.location.href = '/linux'; + {{- else -}} + window.location.href = '{{ printf "%s/linux" $base }}'; {{- end -}} - window.location.href = '{{ printf "%s/linux" $base }}'; {{else}} {{end}} diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html index 0a1a95d5f4..c1f06789f5 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/head/head.html @@ -16,8 +16,13 @@ {{/* ONLY INCLUDE THIS BASE URL IF PUSHING TO PRODUCTION SERVER OR BASEURL POINTS TO ECOSYSTEM-DASHBOARD */}} {{- if or (eq (getenv "HUGO_PRODUCTION") "true") (in .Site.BaseURL "developer.arm.com/ecosystem-dashboard") -}} {{- $base_href := .Site.BaseURL -}} + {{- $base_path := (.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" -}} {{- if eq $base_href "/" -}} - {{- $base_href = "/ecosystem-dashboard/" -}} + {{- if eq $base_path "" -}} + {{- $base_href = "/" -}} + {{- else -}} + {{- $base_href = printf "%s/" $base_path -}} + {{- end -}} {{- end -}} From 9427bb7a04ba687d43fd155d9568b595b78392e5 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:35:35 -0800 Subject: [PATCH 10/21] add config.cloudfront.toml for consistency between deploys --- config.cloudfront.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config.cloudfront.toml diff --git a/config.cloudfront.toml b/config.cloudfront.toml new file mode 100644 index 0000000000..68c3bafe26 --- /dev/null +++ b/config.cloudfront.toml @@ -0,0 +1,4 @@ +baseURL = "https://d1jmgdpytvgwdc.cloudfront.net/" + +[params] +dashboard_base_path = "" From 25ccb0d51103de4119785528b9fad913235e374b Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:36:19 -0800 Subject: [PATCH 11/21] modify main.yml for cloudfront config --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8418df0f61..a8ba727517 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: # Builds arm-software-developer repo - name: Build - run: hugo --minify + run: hugo --minify -c config.toml,config.cloudfront.toml # Deploys website to AWS S3 - name: Deploy to S3 From c2a65331a061e6373a9cd33b664825dd37ecd3fa Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:38:40 -0800 Subject: [PATCH 12/21] Revert "Cloudfront and akamai alignment" --- .github/workflows/main.yml | 2 +- config.cloudfront.toml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 config.cloudfront.toml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8ba727517..8418df0f61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: # Builds arm-software-developer repo - name: Build - run: hugo --minify -c config.toml,config.cloudfront.toml + run: hugo --minify # Deploys website to AWS S3 - name: Deploy to S3 diff --git a/config.cloudfront.toml b/config.cloudfront.toml deleted file mode 100644 index 68c3bafe26..0000000000 --- a/config.cloudfront.toml +++ /dev/null @@ -1,4 +0,0 @@ -baseURL = "https://d1jmgdpytvgwdc.cloudfront.net/" - -[params] -dashboard_base_path = "" From 9652f4158799e29d9db8c6d35ecdc5bb605c3e6e Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:41:23 -0800 Subject: [PATCH 13/21] try to fix cloudfront --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8ba727517..92e20d00c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,7 @@ jobs: # Deploys website to AWS S3 - name: Deploy to S3 - run: hugo deploy --force --maxDeletes -1 --invalidateCDN + run: hugo deploy --force --maxDeletes -1 --invalidateCDN -c config.toml,config.cloudfront.toml env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 4c5f38d6a3a528936b8b775e5f3d4a381389951a Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:43:52 -0800 Subject: [PATCH 14/21] fix main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92e20d00c7..f417e0a941 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,11 +41,11 @@ jobs: # Builds arm-software-developer repo - name: Build - run: hugo --minify -c config.toml,config.cloudfront.toml + run: hugo --minify --config config.toml,config.cloudfront.toml # Deploys website to AWS S3 - name: Deploy to S3 - run: hugo deploy --force --maxDeletes -1 --invalidateCDN -c config.toml,config.cloudfront.toml + run: hugo deploy --force --maxDeletes -1 --invalidateCDN --config config.toml,config.cloudfront.toml env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 2c97458d603e68d60cb206bffcbd9b80feb21e02 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:52:48 -0800 Subject: [PATCH 15/21] add log line --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f417e0a941..6a8a6040d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,9 @@ jobs: # Builds arm-software-developer repo - name: Build - run: hugo --minify --config config.toml,config.cloudfront.toml + run: | + hugo --minify --config config.toml,config.cloudfront.toml + hugo config --config config.toml,config.cloudfront.toml | rg "baseURL|dashboard_base_path" # Deploys website to AWS S3 - name: Deploy to S3 From c9cf6cd3fa18ab267ace00bd178d00ca5ea08814 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:54:36 -0800 Subject: [PATCH 16/21] use grep --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a8a6040d0..1a11174037 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: - name: Build run: | hugo --minify --config config.toml,config.cloudfront.toml - hugo config --config config.toml,config.cloudfront.toml | rg "baseURL|dashboard_base_path" + hugo config --config config.toml,config.cloudfront.toml | grep -E "baseURL|dashboard_base_path" # Deploys website to AWS S3 - name: Deploy to S3 From 44d6134f3c039d600f89c018eeebb30839cf7388 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 13:59:32 -0800 Subject: [PATCH 17/21] confirm cloudfront.toml isn't being read --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a11174037..68915fc452 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,12 @@ jobs: python ./build_steps/update_recently_added_json.py python ./build_steps/validate_package_catagories.py + - name: Debug config + run: | + pwd + ls -l config.cloudfront.toml + cat config.cloudfront.toml + # Builds arm-software-developer repo - name: Build run: | From f636e2ffd541ced631df1eca6d3b05b910bb178c Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 14:02:40 -0800 Subject: [PATCH 18/21] config.cloudfront.toml got dropped somehow? --- config.cloudfront.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config.cloudfront.toml diff --git a/config.cloudfront.toml b/config.cloudfront.toml new file mode 100644 index 0000000000..68c3bafe26 --- /dev/null +++ b/config.cloudfront.toml @@ -0,0 +1,4 @@ +baseURL = "https://d1jmgdpytvgwdc.cloudfront.net/" + +[params] +dashboard_base_path = "" From 92e70d2d6d305837a8c7ba721610a6d2661f2947 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 14:07:54 -0800 Subject: [PATCH 19/21] debugging --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68915fc452..5368067020 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,7 +49,7 @@ jobs: - name: Build run: | hugo --minify --config config.toml,config.cloudfront.toml - hugo config --config config.toml,config.cloudfront.toml | grep -E "baseURL|dashboard_base_path" + hugo config --config config.toml,config.cloudfront.toml | grep -E "baseURL|dashboard_base_path" || true # Deploys website to AWS S3 - name: Deploy to S3 From d46ebbfe7817153630ed34b549aaa33f9571a6a9 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Wed, 18 Feb 2026 14:11:21 -0800 Subject: [PATCH 20/21] remove debug --- .github/workflows/main.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5368067020..f417e0a941 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,17 +39,9 @@ jobs: python ./build_steps/update_recently_added_json.py python ./build_steps/validate_package_catagories.py - - name: Debug config - run: | - pwd - ls -l config.cloudfront.toml - cat config.cloudfront.toml - # Builds arm-software-developer repo - name: Build - run: | - hugo --minify --config config.toml,config.cloudfront.toml - hugo config --config config.toml,config.cloudfront.toml | grep -E "baseURL|dashboard_base_path" || true + run: hugo --minify --config config.toml,config.cloudfront.toml # Deploys website to AWS S3 - name: Deploy to S3 From 18435489afcb2193d26f0abec7327656e4a2f806 Mon Sep 17 00:00:00 2001 From: Christopher Moroney Date: Thu, 19 Feb 2026 09:51:14 -0800 Subject: [PATCH 21/21] remove unnecessary filters --- .../layouts/partials/main-page/main.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/main-page/main.html b/themes/arm-design-system-hugo-theme/layouts/partials/main-page/main.html index e239bf8572..1237a147fc 100644 --- a/themes/arm-design-system-hugo-theme/layouts/partials/main-page/main.html +++ b/themes/arm-design-system-hugo-theme/layouts/partials/main-page/main.html @@ -12,7 +12,12 @@ {{ $filter_licenses := slice "All" "Open source" "Commercial" }} -{{ $filter_categories := (slice "All") | append .context.Site.Data.category_data.groups}} +{{ $filter_categories_all := (slice "All") | append .context.Site.Data.category_data.groups}} +{{ $filter_categories := $filter_categories_all }} +{{ if eq .OS "Windows" }} + {{/* Only show Windows categories that have packages */}} + {{ $filter_categories = slice "All" "AI/ML" "Cloud-native" "Database" "Languages" "Media" "Networking" "Security" "Web" "Miscellaneous" }} +{{ end }} {{/******************************************************* *******************************************************/}} @@ -117,5 +122,3 @@

Most recently added packa {{ partial "eco-dashboard/scripts-for-three-ctas.html"}} */}} - -