Skip to content

Commit 00e6dbc

Browse files
authored
Release: 24.06 (#330)
* Release: 24.06 The June release 🎉 * 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.
1 parent 106dfca commit 00e6dbc

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.github/workflows/windows.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
with:
1717
python-version: '3.x'
1818
- name: Build & Install
19+
env:
20+
# Work-around for windows-latest GH runner issue, see
21+
# https://github.com/actions/runner-images/issues/10004
22+
CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
1923
run: |
2024
set "CMAKE_BUILD_PARALLEL_LEVEL=4"
2125

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Preamble ####################################################################
22
#
33
cmake_minimum_required(VERSION 3.20.0)
4-
project(pyAMReX VERSION 24.05)
4+
project(pyAMReX VERSION 24.06)
55

66
include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)
77

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ macro(find_amrex)
7070
elseif(NOT pyAMReX_amrex_internal)
7171
message(STATUS "Searching for pre-installed AMReX ...")
7272
# https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
73-
find_package(AMReX 24.05 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
73+
find_package(AMReX 24.06 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
7474
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
7575

7676
if(AMReX_GPU_BACKEND STREQUAL CUDA)
@@ -89,7 +89,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
8989
set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
9090
CACHE STRING
9191
"Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
92-
set(pyAMReX_amrex_branch "28b010126a1b39297d8a496ba81f171d8563953b"
92+
set(pyAMReX_amrex_branch "24.06"
9393
CACHE STRING
9494
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
9595

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
# built documents.
7373
#
7474
# The short X.Y version.
75-
version = "24.05"
75+
version = "24.06"
7676
# The full version, including alpha/beta/rc tags.
77-
release = "24.05"
77+
release = "24.06"
7878

7979
# The language for content autogenerated by Sphinx. Refer to documentation
8080
# for a list of supported languages.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def build_extension(self, ext):
210210
setup(
211211
name="amrex",
212212
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
213-
version="24.05",
213+
version="24.06",
214214
packages=["amrex"],
215215
# Python sources:
216216
package_dir={"": "src"},

0 commit comments

Comments
 (0)