From ebe8540ec8e33c89caf4e6cb6a8223e92106f530 Mon Sep 17 00:00:00 2001
From: Rasmus Wejlgaard <pez@pez.sh>
Date: Tue, 2 Jun 2026 19:29:54 +0100
Subject: [PATCH] ci: serialize infra runs and enable terraform state locking

Add concurrency guards to the terraform and deploy-on-merge workflows so
two merges in quick succession can't run against the same state or the
same hosts at once (queue, never cancel an in-flight run).

Enable native S3 state locking (use_lockfile) on the Backblaze B2 backend,
which needs OpenTofu 1.10+, so bump the CI tofu version 1.9.0 -> 1.10.10
and the required_version constraint to >= 1.10.0.
---
 .github/workflows/deploy-on-merge.yml |  6 ++++++
 .github/workflows/terraform.yml       | 11 +++++++++--
 terraform/providers.tf                |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-on-merge.yml b/.github/workflows/deploy-on-merge.yml
index 15db35f..953f952 100644
--- a/.github/workflows/deploy-on-merge.yml
+++ b/.github/workflows/deploy-on-merge.yml
@@ -7,6 +7,12 @@ on:
     paths-ignore:
       - "terraform/**"
 
+# Serialize fleet deploys so two quick merges can't run Ansible against the
+# same hosts at once. Don't cancel an in-flight deploy mid-run — queue it.
+concurrency:
+  group: deploy-on-merge
+  cancel-in-progress: false
+
 jobs:
   discover:
     name: Discover hosts
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 7d97dda..8b2168c 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -10,6 +10,13 @@ on:
 # Requires these repository secrets:
 #   AGE_SECRET_KEY     — age private key for SOPS decryption
 
+# Serialize Terraform runs so two merges can't apply against the state
+# concurrently. Never cancel an in-flight run (an interrupted apply can
+# corrupt state) — queue instead.
+concurrency:
+  group: terraform-state
+  cancel-in-progress: false
+
 jobs:
   plan:
     name: Plan
@@ -20,7 +27,7 @@ jobs:
       - name: Install OpenTofu
         uses: opentofu/setup-opentofu@v2
         with:
-          tofu_version: 1.9.0
+          tofu_version: 1.10.10
 
       - name: Install SOPS
         run: |
@@ -71,7 +78,7 @@ jobs:
       - name: Install OpenTofu
         uses: opentofu/setup-opentofu@v2
         with:
-          tofu_version: 1.9.0
+          tofu_version: 1.10.10
 
       - name: Install SOPS
         run: |
diff --git a/terraform/providers.tf b/terraform/providers.tf
index 69f73a5..516865f 100644
--- a/terraform/providers.tf
+++ b/terraform/providers.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.6.0"
+  required_version = ">= 1.10.0"
 
   required_providers {
     hcloud = {
@@ -24,6 +24,7 @@ terraform {
     region                      = "eu-central-003"
     skip_credentials_validation = true
     skip_region_validation      = true
+    use_lockfile                = true
     # Credentials read from AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY env vars
   }
 }