From 221d95f0f79f67fd7fda85d51d532f9ff0b99d8a Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Sun, 9 Jun 2024 16:28:28 +0200
Subject: [PATCH 1/2] Release: 24.06

The June release :tada:
---
 CMakeLists.txt                 | 2 +-
 cmake/dependencies/AMReX.cmake | 4 ++--
 docs/source/conf.py            | 4 ++--
 setup.py                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8476ab31..d3f70a09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.20.0)
-project(pyAMReX VERSION 24.05)
+project(pyAMReX VERSION 24.06)
 
 include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)
 
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index ca0413d3..9b33ca59 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -70,7 +70,7 @@ macro(find_amrex)
     elseif(NOT pyAMReX_amrex_internal)
         message(STATUS "Searching for pre-installed AMReX ...")
         # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
-        find_package(AMReX 24.05 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
+        find_package(AMReX 24.06 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
         message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
 
         if(AMReX_GPU_BACKEND STREQUAL CUDA)
@@ -89,7 +89,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
 set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
-set(pyAMReX_amrex_branch "28b010126a1b39297d8a496ba81f171d8563953b"
+set(pyAMReX_amrex_branch "24.06"
     CACHE STRING
     "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index a99c78e3..ab87a48e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "24.05"
+version = "24.06"
 # The full version, including alpha/beta/rc tags.
-release = "24.05"
+release = "24.06"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 8f431e82..836c79c2 100644
--- a/setup.py
+++ b/setup.py
@@ -210,7 +210,7 @@ def build_extension(self, ext):
 setup(
     name="amrex",
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version="24.05",
+    version="24.06",
     packages=["amrex"],
     # Python sources:
     package_dir={"": "src"},

From 6c7a510eae2689ba2900c70c76f52d92d270ee2e Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 10 Jun 2024 11:22:56 -0700
Subject: [PATCH 2/2] CI: Work-Around GH Action Runner Win

Work around the latest Windows GH action runner image update that
breaks compiles, likely due to DLL mismatches.
---
 .github/workflows/windows.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index e7bf8bbc..13051dbf 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,6 +16,10 @@ jobs:
       with:
         python-version: '3.x'
     - name: Build & Install
+      env:
+        # Work-around for windows-latest GH runner issue, see
+        # https://github.com/actions/runner-images/issues/10004
+        CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
       run: |
         set "CMAKE_BUILD_PARALLEL_LEVEL=4"