From 7ffb77cc9a3b66706350e43055a33132b3fb7472 Mon Sep 17 00:00:00 2001 From: Matt Spencer Date: Sun, 19 Dec 2021 11:44:47 +0000 Subject: [PATCH 1/3] Turn site index into a branch bundle Hugo wants pages that have children to be a branch bundle. This changes the way the shortcode references media. - Move index.md to _index.md - Create a headless page to hold media assets - Update imagegrid to allow spcifying page for resources Signed-off-by: Matt Spencer --- content/{index.md => _index.md} | 2 +- content/{ => headless_media}/images/arm.png | Bin content/{ => headless_media}/images/aws.png | Bin content/{ => headless_media}/images/bosch.png | Bin .../{ => headless_media}/images/continental.jpg | Bin content/{ => headless_media}/images/redhat.png | Bin content/{ => headless_media}/images/suse.png | Bin .../{ => headless_media}/images/woven_planet.png | Bin content/headless_media/index.md | 10 ++++++++++ content/images/Logo-redhat-color-375.png | Bin 5993 -> 0 bytes themes/soafee/layouts/shortcodes/imagegrid.html | 9 ++++++--- 11 files changed, 17 insertions(+), 4 deletions(-) rename content/{index.md => _index.md} (98%) rename content/{ => headless_media}/images/arm.png (100%) rename content/{ => headless_media}/images/aws.png (100%) rename content/{ => headless_media}/images/bosch.png (100%) rename content/{ => headless_media}/images/continental.jpg (100%) rename content/{ => headless_media}/images/redhat.png (100%) rename content/{ => headless_media}/images/suse.png (100%) rename content/{ => headless_media}/images/woven_planet.png (100%) create mode 100644 content/headless_media/index.md delete mode 100644 content/images/Logo-redhat-color-375.png diff --git a/content/index.md b/content/_index.md similarity index 98% rename from content/index.md rename to content/_index.md index c398c8a..41ae4f6 100644 --- a/content/index.md +++ b/content/_index.md @@ -38,7 +38,7 @@ The Governing Body comprises a group of industry experts to ensure that market i ### Governing Body Members -{{< imagegrid columns="3" data="members.governing_body">}} +{{< imagegrid columns="3" data="members.governing_body" media_page="headless_media" >}} ### SOAFEE Steering Committees diff --git a/content/images/arm.png b/content/headless_media/images/arm.png similarity index 100% rename from content/images/arm.png rename to content/headless_media/images/arm.png diff --git a/content/images/aws.png b/content/headless_media/images/aws.png similarity index 100% rename from content/images/aws.png rename to content/headless_media/images/aws.png diff --git a/content/images/bosch.png b/content/headless_media/images/bosch.png similarity index 100% rename from content/images/bosch.png rename to content/headless_media/images/bosch.png diff --git a/content/images/continental.jpg b/content/headless_media/images/continental.jpg similarity index 100% rename from content/images/continental.jpg rename to content/headless_media/images/continental.jpg diff --git a/content/images/redhat.png b/content/headless_media/images/redhat.png similarity index 100% rename from content/images/redhat.png rename to content/headless_media/images/redhat.png diff --git a/content/images/suse.png b/content/headless_media/images/suse.png similarity index 100% rename from content/images/suse.png rename to content/headless_media/images/suse.png diff --git a/content/images/woven_planet.png b/content/headless_media/images/woven_planet.png similarity index 100% rename from content/images/woven_planet.png rename to content/headless_media/images/woven_planet.png diff --git a/content/headless_media/index.md b/content/headless_media/index.md new file mode 100644 index 0000000..a199fbf --- /dev/null +++ b/content/headless_media/index.md @@ -0,0 +1,10 @@ +--- +headless: true +--- + +This is a headless page resource. + +https://gohugo.io/content-management/page-bundles/#headless-bundle + +It will not be published, but is a page bundle that +can be referenced by other pages. \ No newline at end of file diff --git a/content/images/Logo-redhat-color-375.png b/content/images/Logo-redhat-color-375.png deleted file mode 100644 index 3b85b90fd75aa48aaecc6692fdad2992a37999fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5993 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 {{ range index .Site.Data (split .Params.data "." ) }} {{ $row = div $index $columns}} @@ -26,9 +30,8 @@ {{ end }} {{ end }} - - {{ $image := $.Page.Resources.GetMatch .image }} - {{ $placeholder := $image.Fit "600x300"}} + {{ $image := $resourcesPage.Resources.GetMatch .image }} + {{ $placeholder := $image.Fit "600x300" }}
-- GitLab From 3fa51bfd8fb4b47817952d465798719b7a395e46 Mon Sep 17 00:00:00 2001 From: Matt Spencer Date: Sun, 19 Dec 2021 11:54:44 +0000 Subject: [PATCH 2/3] Add ci for non-main branch Simply run the hugo script to ensure the site builds --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9295cd..cfee806 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,11 @@ image: variables: GIT_SUBMODULE_STRATEGY: recursive -#test: -# script: -# - hugo -# except: -# - main +test: + script: + - hugo + except: + - main pages: tags: -- GitLab From 5e7abc53ad55e6b6c44f97ae089af2e2e6e857ae Mon Sep 17 00:00:00 2001 From: Matt Spencer Date: Sun, 19 Dec 2021 12:30:41 +0000 Subject: [PATCH 3/3] Ensure the correct builder is used for testing --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfee806..ae6d56e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,8 @@ variables: GIT_SUBMODULE_STRATEGY: recursive test: + tags: + - pages-builder script: - hugo except: -- GitLab