Skip to content

ci update #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
sys:
- { os: windows-2019, shell: "msys2 {0}" }
- { os: ubuntu-20.04, shell: bash }
- { os: macos-11, shell: bash }
- { os: macos-13, shell: bash }
defaults:
run:
shell: ${{ matrix.sys.shell }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"

- if: runner.os == 'Windows'
uses: msys2/setup-msys2@v2
Expand Down
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(M_CLI2_TAG "7264878cdb1baff7323cc48596d829ccfe7751b8" CACHE STRING "Set git
set(JONQUIL_TAG "4fbd4cf34d577c0fd25e32667ee9e41bf231ece8" CACHE STRING "Set git tag for jonquil")
set(REGEX_TAG "1.1.2" CACHE STRING "Set git tag for Fortran-regex")
set(SHLEX_TAG "1.0.1" CACHE STRING "Set git tag for fortran-shlex")
set(FPM_VERSION "0.10.1" CACHE STRING "Set fpm version e.g. 8.0.0")
set(FPM_VERSION "0.11.0" CACHE STRING "Set fpm version e.g. 8.0.0")
set(FPM_TAG "v${FPM_VERSION}" CACHE STRING "Set git tag for fpm, default is v${FPM_VERSION}")

set(BIN_NAME ${CMAKE_PROJECT_NAME})
Expand Down Expand Up @@ -98,7 +98,7 @@ file(GLOB_RECURSE
${regex_src_SOURCE_DIR}/src/*.f90
${shlex_src_SOURCE_DIR}/src/*.f90
${fpm_src_SOURCE_DIR}/src/*.f90
${fpm_src_SOURCE_DIR}/src/*.F90
${fpm_src_SOURCE_DIR}/src/*.F90
${fpm_src_SOURCE_DIR}/src/*.h
${fpm_src_SOURCE_DIR}/src/*.c
)
Expand All @@ -111,12 +111,6 @@ add_executable(${BIN_NAME} ${SRC_FILES} ${fpm_src_SOURCE_DIR}/app/main.f90)
# version preproc tag was added in fpm 0.8.2
target_compile_definitions(${BIN_NAME} PRIVATE FPM_RELEASE_VERSION=${FPM_VERSION})

# HACK: circumvent compiler's default preprocessor heuristic and enable it
# globally. This is to circumvent sr/fpm/fpm_release.f90 erroneous lowecase
# file extension.
# Remove in the next fpm release
target_compile_options(${BIN_NAME} PRIVATE "-cpp")

if(OpenMP_Fortran_FOUND)
message(STATUS "OpenMP Fortran found: Building fpm for parallel execution")
target_link_libraries(${BIN_NAME} PUBLIC OpenMP::OpenMP_Fortran)
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ bug-tracker = "https://github.com/fortran-lang/fpm/issues"
write_to = "src/fpm/_version.py"

[tool.cibuildwheel]
build = "cp310-*"
build = "cp312-*"
build-verbosity = "3"

[tool.cibuildwheel.macos]
archs = ["x86_64", "arm64"]
environment = { CC = "clang", CXX = "clang++", FC = "gfortran-11" }
environment = { CC = "clang", CXX = "clang++", FC = "gfortran-12", MACOSX_DEPLOYMENT_TARGET = 13.0 }

[[tool.cibuildwheel.overrides]]
select = "*-macosx_arm64"
Expand Down
Loading