From ac63253f34d9e93ab886552e224ea2d390f94b76 Mon Sep 17 00:00:00 2001
From: ruben <ruben@thoughtmachine.net>
Date: Fri, 19 Jun 2026 14:08:02 +0100
Subject: [PATCH 1/5] Revert "Rollback for  "fix failure when pushing linter
 update (#350)" (#355)"

This reverts commit 68b950a129fa86972bc2ca551a1bd6cd6344adb6.
---
 .plzconfig.ci | 11 ++++++++---
 ChangeLog     |  4 ----
 VERSION       |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.plzconfig.ci b/.plzconfig.ci
index 05cb1220..85f172ed 100644
--- a/.plzconfig.ci
+++ b/.plzconfig.ci
@@ -5,12 +5,17 @@ dircompress = true
 
 [plugin "go"]
 target = //plugins:go
-defaultstatic = true
+defaultstatic = false
 gotool = //third_party/go:toolchain|go
 coverageredesign = true
 
-[Plugin "proto"]
-protoctool = protoc
+[plugin "cc"]
+target = //plugins:cc
+defaultoptcflags = --std=c99 -O3 -pipe -DNDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
+defaultdbgcflags = --std=c99 -g3 -pipe -DDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
+
+[plugin "proto"]
+ProtocTool = //third_party/proto:protoc
 
 [display]
 systemstats = false
diff --git a/ChangeLog b/ChangeLog
index 05a7fe38..bd0100bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Version 11.16.9
----------------
-    * Rollback of commit that broke mettle deployment
-
 Version 11.16.8
 ---------------
     * This change removes the temporary logging that was added to help investigate the hanging processes.
diff --git a/VERSION b/VERSION
index e1a99a93..abdea9f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.16.9
+11.16.8

From 1407bfbd605d2a1d38e2bda00e44a24db4bb0981 Mon Sep 17 00:00:00 2001
From: ruben <ruben@thoughtmachine.net>
Date: Fri, 19 Jun 2026 14:08:35 +0100
Subject: [PATCH 2/5] set defaultstatic = true

---
 .plzconfig.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.plzconfig.ci b/.plzconfig.ci
index 85f172ed..51749d71 100644
--- a/.plzconfig.ci
+++ b/.plzconfig.ci
@@ -5,7 +5,7 @@ dircompress = true
 
 [plugin "go"]
 target = //plugins:go
-defaultstatic = false
+defaultstatic = true
 gotool = //third_party/go:toolchain|go
 coverageredesign = true
 

From 306a6fb7bf13015b0d01c470d451dbd2cab2e8a0 Mon Sep 17 00:00:00 2001
From: ruben <ruben@thoughtmachine.net>
Date: Fri, 19 Jun 2026 14:17:46 +0100
Subject: [PATCH 3/5] update

---
 ChangeLog | 4 ++++
 VERSION   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bd0100bf..9a871aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 11.16.9
+---------------
+    * Apply defaultstatic = true to fix Mettle broken deployment
+
 Version 11.16.8
 ---------------
     * This change removes the temporary logging that was added to help investigate the hanging processes.
diff --git a/VERSION b/VERSION
index abdea9f1..e1a99a93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.16.8
+11.16.9

From 76bf0dc91fa303398152fc34e717154c3dbc7ba1 Mon Sep 17 00:00:00 2001
From: Ruben Rizzi <raynor85@users.noreply.github.com>
Date: Fri, 19 Jun 2026 15:21:16 +0100
Subject: [PATCH 4/5] Apply suggestion from @toastwaffle

Co-authored-by: Samuel Littley <samuel.littley@toastwaffle.com>
---
 .plzconfig.ci | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.plzconfig.ci b/.plzconfig.ci
index 51749d71..b11e1a6b 100644
--- a/.plzconfig.ci
+++ b/.plzconfig.ci
@@ -10,7 +10,6 @@ gotool = //third_party/go:toolchain|go
 coverageredesign = true
 
 [plugin "cc"]
-target = //plugins:cc
 defaultoptcflags = --std=c99 -O3 -pipe -DNDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
 defaultdbgcflags = --std=c99 -g3 -pipe -DDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
 

From 3afc38fac7298b2dd212930ee2e081656dd48531 Mon Sep 17 00:00:00 2001
From: Ruben Rizzi <raynor85@users.noreply.github.com>
Date: Fri, 19 Jun 2026 15:21:37 +0100
Subject: [PATCH 5/5] Apply suggestion from @toastwaffle

Co-authored-by: Samuel Littley <samuel.littley@toastwaffle.com>
---
 .plzconfig.ci | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.plzconfig.ci b/.plzconfig.ci
index b11e1a6b..eb04d894 100644
--- a/.plzconfig.ci
+++ b/.plzconfig.ci
@@ -13,8 +13,6 @@ coverageredesign = true
 defaultoptcflags = --std=c99 -O3 -pipe -DNDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
 defaultdbgcflags = --std=c99 -g3 -pipe -DDEBUG -Wall -Werror -Wno-error=stringop-overflow -Wno-error=misleading-indentation
 
-[plugin "proto"]
-ProtocTool = //third_party/proto:protoc
 
 [display]
 systemstats = false