From 1f1e6bf0314aa93acb9ec8cacbdf0c94575e6f48 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Wed, 15 May 2024 15:42:32 +0200
Subject: [PATCH 1/2] ci: bump runner to ubuntu-22.04

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 .github/workflows/build.yml             | 8 ++++----
 .github/workflows/deploy.yml            | 2 +-
 .github/workflows/labeler.yml           | 2 +-
 .github/workflows/merge.yml             | 2 +-
 .github/workflows/validate-upstream.yml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6aca3b5353..185b1c212e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -37,7 +37,7 @@ jobs:
 
   vale:
     if: ${{ github.event_name == 'pull_request' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018
@@ -45,7 +45,7 @@ jobs:
           files: content
 
   validate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -74,7 +74,7 @@ jobs:
   # build-releaser job will just build _releaser app used for Netlify and
   # AWS deployment in publish workflow. it's just to be sure it builds correctly.
   build-releaser:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3a12fcc8f5..e7a1ce3726 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'docker'
     steps:
       -
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index a9405b2584..bdaa6a0e52 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   labeler:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 4d4a38f952..7ab7d186f9 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   main-to-published:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'docker'
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/validate-upstream.yml b/.github/workflows/validate-upstream.yml
index 14525d9a35..4fd919c8c7 100644
--- a/.github/workflows/validate-upstream.yml
+++ b/.github/workflows/validate-upstream.yml
@@ -25,7 +25,7 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout

From 8bfe52f43e848d3d90ef9838ac4d93c15e6f0f43 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:02:31 +0200
Subject: [PATCH 2/2] ci: ignore externally managed environment python error

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 185b1c212e..ea38d4cc0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,6 +41,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018
+        env:
+          PIP_BREAK_SYSTEM_PACKAGES: 1
         with:
           files: content