Skip to content

Commit

Permalink
Release: 24.06 (#330)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
ax3l committed Jun 10, 2024
1 parent 106dfca commit 00e6dbc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)")

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down

0 comments on commit 00e6dbc

Please sign in to comment.