Merge pull request #1827 from felixfontein/release-3.10.1

sabre1041 · web-flow · commit acc47adaa001 · 2025-03-31T12:28:14.000-05:00
Release 3.10.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 3.10.1
+
+This is a re-release of 3.10.0 with no code changes.
+
+Due to a failure during the 3.10.0 release, the
+[commit cached by the Go infrastructure for 3.10.0](https://github.com/getsops/sops/commit/200bb6d8ab4063330bc99697255b3583501b3877)
+is different from
+[the commit tagged in the repository](https://github.com/getsops/sops/commit/4ed7060298fbcd00cafa359121ca62091b85bb6f).
+To avoid confusion, we decided to push another release where the tag in the repository
+will coincide with the commit cached by Go.
+
+Project changes:
+
+* CI dependency updates ([#1826](https://github.com/getsops/sops/pull/1826)).
+
 ## 3.10.0
 
 Security fixes:
diff --git a/version/version.go b/version/version.go
@@ -12,7 +12,7 @@ import (
 )
 
 // Version represents the value of the current semantic version.
-var Version = "3.10.0"
+var Version = "3.10.1"
 
 // PrintVersion prints the current version of sops. If the flag
 // `--disable-version-check` is set or if the environment variable

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Version represents the value of the current semantic version.`
`15`		`-var Version = "3.10.0"`
	`15`	`+var Version = "3.10.1"`
`16`	`16`
`17`	`17`	`// PrintVersion prints the current version of sops. If the flag`
`18`	`18`	// `--disable-version-check` is set or if the environment variable