From d797b72ac8fa151bc733d3cb11f201140c568cc2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 00:27:31 +0000
Subject: [PATCH 1/2] chore(actions): update dependency ubuntu to v24

---
 .github/workflows/merge-main.yml   | 4 ++--
 .github/workflows/pull-request.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index f64de40..8f87eca 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   prepare:
     name: Calculate Version and Build number
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     outputs:
       build_number: ${{ steps.short_sha.outputs.value }}
@@ -42,7 +42,7 @@ jobs:
     if: needs.prepare.outputs.new_release == 'true'
 
     name: Dev and Draft Releases
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     needs:
     - prepare
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index b2290b4..c885cde 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   validate:
     name: Validate
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4

From 2912cfa6882562818be4431f48b756e77fa43aa8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 21:09:11 +0000
Subject: [PATCH 2/2] chore(deps): update swift docker tag to v6

---
 .devcontainer/devcontainer.json    | 2 +-
 .github/workflows/merge-main.yml   | 4 ++--
 .github/workflows/pull-request.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a9e28ac..fc676d5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Swift 5.6",
-  "image": "swift:5.6-focal",
+  "image": "swift:6.1-focal",
   "extensions": [
     "sswg.swift-lang"
   ],
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 8f87eca..f64de40 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   prepare:
     name: Calculate Version and Build number
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     outputs:
       build_number: ${{ steps.short_sha.outputs.value }}
@@ -42,7 +42,7 @@ jobs:
     if: needs.prepare.outputs.new_release == 'true'
 
     name: Dev and Draft Releases
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     needs:
     - prepare
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c885cde..b2290b4 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   validate:
     name: Validate
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v4