From 399a8171783b4686f5522fce18dc4035b96a9966 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <jelle.spijker@ultimaker.com>
Date: Mon, 15 Jan 2024 13:37:54 +0100
Subject: [PATCH 1/3] Use `self-hosted-Windows-X64` as default

Contributes to CURA-11544
---
 .github/workflows/installers.yml | 2 +-
 .github/workflows/windows.yml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 6e531ba833..f1bd4b2d19 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -58,7 +58,7 @@ jobs:
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: X64
-      operating_system: windows-2022
+      operating_system: self-hosted-Windows-X64
     secrets: inherit
 
   linux-installer:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 22a81e9b2a..09f972bb1a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -34,9 +34,10 @@ on:
       operating_system:
         description: 'OS'
         required: true
-        default: 'windows-2022'
+        default: 'self-hosted-Windows-X64'
         type: choice
         options:
+          - self-hosted-Windows-X64
           - windows-2022
 
 jobs:

From c1e7bc15285ef7feb2c31bc38dc5f3b8c39471e1 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <jelle.spijker@ultimaker.com>
Date: Mon, 15 Jan 2024 17:12:30 +0100
Subject: [PATCH 2/3] Use updated CPython recipe

Contributes to CURA-11544
---
 conanfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index ea1ac2e1f9..f9e452cb9d 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -334,7 +334,7 @@ class CuraConan(ConanFile):
         if self._internal:
             for req in self.conan_data["requirements_internal"]:
                 self.requires(req)
-        self.requires("cpython/3.10.4@ultimaker/stable")
+        self.requires("cpython/3.10.4@ultimaker/cura_11544")  # FIXME: once merged to main
         self.requires("openssl/3.2.0")
         self.requires("boost/1.82.0")
         self.requires("spdlog/1.12.0")

From e6235063aa866a863f176dc8baaf6a3ea1d21169 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Wed, 17 Jan 2024 12:05:42 +0100
Subject: [PATCH 3/3] Revert "Use updated CPython recipe"

This reverts commit c1e7bc15285ef7feb2c31bc38dc5f3b8c39471e1.
---
 conanfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index f9e452cb9d..ea1ac2e1f9 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -334,7 +334,7 @@ class CuraConan(ConanFile):
         if self._internal:
             for req in self.conan_data["requirements_internal"]:
                 self.requires(req)
-        self.requires("cpython/3.10.4@ultimaker/cura_11544")  # FIXME: once merged to main
+        self.requires("cpython/3.10.4@ultimaker/stable")
         self.requires("openssl/3.2.0")
         self.requires("boost/1.82.0")
         self.requires("spdlog/1.12.0")