From cdf4dab0a5f70c29c6fb5f2302fef20cc03a6cbd Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 8 Mar 2022 15:02:53 +0100
Subject: [PATCH] Cross compile windows on fedora 35.

---
 .../{f31_builder.dockerfile => f35_builder.dockerfile}      | 4 ++--
 .github/workflows/ci.yml                                    | 6 +++---
 .github/workflows/releaseNigthly.yml                        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename .github/ci_images/{f31_builder.dockerfile => f35_builder.dockerfile} (96%)

diff --git a/.github/ci_images/f31_builder.dockerfile b/.github/ci_images/f35_builder.dockerfile
similarity index 96%
rename from .github/ci_images/f31_builder.dockerfile
rename to .github/ci_images/f35_builder.dockerfile
index a96d7a5..62d8f83 100644
--- a/.github/ci_images/f31_builder.dockerfile
+++ b/.github/ci_images/f35_builder.dockerfile
@@ -1,7 +1,7 @@
-FROM fedora:31
+FROM fedora:35
 
 ENV LANG C.UTF-8
-ENV OS_NAME f31
+ENV OS_NAME f35
 
 RUN dnf install -y --nodocs \
 # Base build tools
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c54a4c5..e47d9d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [xenial, bionic, f31, focal]
+        variant: [xenial, bionic, f35, focal]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -50,10 +50,10 @@ jobs:
         lib_postfix: ['/x86_64-linux-gnu']
         include:
           - target: win32_static
-            image_variant: f31
+            image_variant: f35
             lib_postfix: '64'
           - target: win32_dyn
-            image_variant: f31
+            image_variant: f35
             lib_postfix: '64'
         exclude:
           - target: native_desktop
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index a4d0c10..9a081e1 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.github/workflows/releaseNigthly.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [xenial, bionic, f31, focal]
+        variant: [xenial, bionic, f35, focal]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -62,7 +62,7 @@ jobs:
             image_variant: xenial
             lib_postfix: '/x86_64-linux-gnu'
           - target: win32_static
-            image_variant: f31
+            image_variant: f35
             lib_postfix: '64'
           - target: i586_static
             image_variant: xenial