Fix missing method NameNormalized panic

Closes #12795
deps: Upgraded github.com/bep/imagemeta v0.8.0 => v0.8.1
2026-09-01 03:02:38 +00:00 · 2024-08-25 22:51:38 +02:00 · 2024-08-24 18:52:03 +02:00 · 2024-08-21 22:01:59 +02:00 · 2024-08-18 19:12:03 +02:00 · 2024-08-18 19:12:02 +02:00
7 changed files with 18 additions and 16 deletions
@@ -98,16 +98,9 @@ workflows:
  release:
      jobs:  
        - prepare_release:
-          when:
-            and:
-              - matches:
-                  pattern: "^release-"
-                  value: << pipeline.git.branch >>
-              - not:
-                - matches:
-                    pattern: "NOCIRCLECI"
-                    value: << pipeline.trigger_parameters.github_app.commit_message >>
-
+            filters:
+              branches:
+                only: /release-.*/
        - build_container1:
            requires:
            - prepare_release
@@ -381,12 +381,12 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {

 	// Legacy paginate values.
 	if c.Paginate != 0 {
-		hugo.Deprecate("site config key paginate", "Use paginator.pagerSize instead.", "v0.128.0")
+		hugo.Deprecate("site config key paginate", "Use pagination.pagerSize instead.", "v0.128.0")
 		c.Pagination.PagerSize = c.Paginate
 	}

 	if c.PaginatePath != "" {
-		hugo.Deprecate("site config key paginatePath", "Use paginator.path instead.", "v0.128.0")
+		hugo.Deprecate("site config key paginatePath", "Use pagination.path instead.", "v0.128.0")
 		c.Pagination.Path = c.PaginatePath
 	}

@@ -15,7 +15,7 @@ require (
 	github.com/bep/golibsass v1.1.1
 	github.com/bep/gowebp v0.3.0
 	github.com/bep/helpers v0.4.0
-	github.com/bep/imagemeta v0.8.0
+	github.com/bep/imagemeta v0.8.1
 	github.com/bep/lazycache v0.4.0
 	github.com/bep/logg v0.4.0
 	github.com/bep/mclib v1.20400.20402
@@ -141,6 +141,8 @@ github.com/bep/helpers v0.4.0 h1:ab9veaAiWY4ST48Oxp5usaqivDmYdB744fz+tcZ3Ifs=
 github.com/bep/helpers v0.4.0/go.mod h1:/QpHdmcPagDw7+RjkLFCvnlUc8lQ5kg4KDrEkb2Yyco=
 github.com/bep/imagemeta v0.8.0 h1:4lqI839akl6lR61D7hmvaw2LDOxiXFZ4D0VIyHyGpc4=
 github.com/bep/imagemeta v0.8.0/go.mod h1:5piPAq5Qomh07m/dPPCLN3mDJyFusvUG7VwdRD/vX0s=
+github.com/bep/imagemeta v0.8.1 h1:tjZLPRftjxU7PTI87o5e5WKOFQ4S9S0engiP1OTpJTI=
+github.com/bep/imagemeta v0.8.1/go.mod h1:5piPAq5Qomh07m/dPPCLN3mDJyFusvUG7VwdRD/vX0s=
 github.com/bep/lazycache v0.4.0 h1:X8yVyWNVupPd4e1jV7efi3zb7ZV/qcjKQgIQ5aPbkYI=
 github.com/bep/lazycache v0.4.0/go.mod h1:NmRm7Dexh3pmR1EignYR8PjO2cWybFQ68+QgY3VMCSc=
 github.com/bep/logg v0.4.0 h1:luAo5mO4ZkhA5M1iDVDqDqnBBnlHjmtZF6VAyTp+nCQ=
@@ -560,7 +560,7 @@ func (m *pageMap) getOrCreateResourcesForPage(ps *pageState) resource.Resources
 				for _, r := range res2 {
 					var found bool
 					for _, r2 := range res {
-						if r2.(resource.NameNormalizedProvider).NameNormalized() == r.(resource.NameNormalizedProvider).NameNormalized() {
+						if resource.NameNormalizedOrName(r2) == resource.NameNormalizedOrName(r) {
 							found = true
 							break
 						}
@@ -101,8 +101,7 @@ func (r *ReleaseHandler) Run() error {
 			return err
 		}

-		// About NOCIRCLECI, see issue #12753.
-		if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\nNOCIRCLECI", commitPrefix, newVersion)); err != nil {
+		if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil {
 			return err
 		}

@@ -298,3 +298,11 @@ func (r resourceTypesHolder) ResourceType() string {
 func NewResourceTypesProvider(mediaType media.Type, resourceType string) ResourceTypesProvider {
 	return resourceTypesHolder{mediaType: mediaType, resourceType: resourceType}
 }
+
+// NameNormalizedOrName returns the normalized name if available, otherwise the name.
+func NameNormalizedOrName(r Resource) string {
+	if nn, ok := r.(NameNormalizedProvider); ok {
+		return nn.NameNormalized()
+	}
+	return r.Name()
+}
Author	SHA1	Message	Date
Bjørn Erik Pedersen	3cbb006eb8	Fix missing method NameNormalized panic Closes #12795	2024-08-25 22:51:38 +02:00
Bjørn Erik Pedersen	e1becf1dfe	deps: Upgraded github.com/bep/imagemeta v0.8.0 => v0.8.1 Closes #12793	2024-08-24 18:52:03 +02:00
Joe Mooring	7792392a6f	config: Fix pagination deprecation messages	2024-08-21 22:01:59 +02:00
Bjørn Erik Pedersen	46484bff84	Revert "releaser: Rework the run conditions" This reverts commit `702b1e8b81`.	2024-08-18 19:12:03 +02:00
Bjørn Erik Pedersen	0e5a26057c	Revert "circleci: Upgrade to version 2.1 of the schema" This reverts commit `c8f850ae17`.	2024-08-18 19:12:02 +02:00
Bjørn Erik Pedersen	c8f850ae17	circleci: Upgrade to version 2.1 of the schema Updates #12753	2024-08-18 18:49:42 +02:00
Bjørn Erik Pedersen	702b1e8b81	releaser: Rework the run conditions Now after actually reading the CircleCI docs... Closes #12753	2024-08-18 18:46:56 +02:00
Bjørn Erik Pedersen	73d32e7737	Revert "releaser: Rework the run conditions" This reverts commit `777534b2a4`. Circle ci throws validation errors: ``` Config does not conform to schema: {:workflows {:release {:jobs [{:prepare_release (not (map? nil)), :when {:and disallowed-key}} nil nil nil]}}} ```	2024-08-18 12:00:47 +02:00