Skip to content
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

ci(mac): use classic linker for gridgen with gnu compilers #173

Merged
merged 1 commit into from
May 26, 2024

Conversation

wpbonelli
Copy link
Member

  • fix gridgen gcc/g++ compile errors with -Wl,-ld_classic to select the classic linker
  • there are still failures building gridgen with intel on macos-14, it looks like a failure to find the appropriate header files — and there is some separate issue building GSFLOW

Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.183%. Comparing base (51313b0) to head (fcb637b).

Additional details and impacted files
@@              Coverage Diff              @@
##           develop      #173       +/-   ##
=============================================
+ Coverage   75.638%   79.183%   +3.545%     
=============================================
  Files           20        20               
  Lines         3526      3526               
=============================================
+ Hits          2667      2792      +125     
+ Misses         859       734      -125     

see 5 files with indirect coverage changes

@jdhughes-usgs jdhughes-usgs marked this pull request as ready for review May 26, 2024 18:17
@jdhughes-usgs jdhughes-usgs merged commit a0c5388 into modflowpy:develop May 26, 2024
15 of 17 checks passed
@wpbonelli wpbonelli deleted the fix-mac-gcc branch May 26, 2024 18:52
jdhughes-usgs added a commit that referenced this pull request Jun 17, 2024
* chore: bump version to 1.2.10.dev0 (#155)

* update workflows to include develop branch

* update(mf6): v6.4.4 (#157)

* feat(cli): add --double option to make-program (#156)

* fix(_usgs_src_update.py): fix function lookup in _build_replace() (#158)

* replace functions are keyed by name as appears in usgsprograms.txt
* lookup did not account for 'dbl' or 'd' appended to program name

* feat(zip): allow appending to an existing zip file using --keep (#159)

* readme: update readme and installation.md (#160)

* refactor(pymake): limit zip file targets to new targets with --keep (#161)

* remove ifort switches that issue warnings
* write absolute zip file path if using --zip argument

* feat(double): restore double switch in usgsprograms.txt (#162)

* make direct evaluation of target names

* feat(code.json): add features to control code.json output (#163)

* feat(code.json): add capability to control code.json output

* remove implicit double_switch for mf2005, mfnwt, mflgr, and mfusg
* add capability to limit code.json to executables in appdir (--partial_json)
* add capability to zip generated code.json (--zip ZIP)
* add capability to update double_switch based on executable names in appdir

* feat(export_json): add appdir kwarg (#164)

* add appdir kwarg to be consistent with make-program
* add --appdir option to make-code-json cli to be consistent with make-program

* chore(dependencies): restrict yanked pytest version 8.1.0 (#165)

* also use fortran-lang/setup-fortran@main to get the latest gcc fix

* chore(formatting): switch to ruff (#166)

* replace isort/black/pylint/flake8
* keep settings mostly identical
* run ruff check --select NPY201, no changes needed

* chore(format): update rules, split long comment lines (#167)

* update rules in pyproject.toml, add import sorting rule 
* split or ignore comment lines where needed for E501

* ci(release): add automated release workflow (#168)

* build(deps): bump actions/checkout from 3 to 4 (#169)

* build(deps): bump actions/setup-python from 4 to 5 (#170)

* fix(mac/gcc/g++): use classic linker with gnu compilers on c/c++ files (#173)

* build(deps): bump dawidd6/action-download-artifact from 2 to 5 (#175)

* update(mf6): update mf6 version (#174)

* update zbud6 extra files
* update mf6examples
* merging with failures

* fix(gsflow): remove gsflow as a possible target (#176)

gsflow (and prms) cause continual problems trying to include them as
prebuilt executables. New versions require additional work to filter out
extraneous source files and object files. The build process uses specific
compiler flags. In short, supporting gsflow (and prms) requires more
support each time we are ready to make a executables release or when
a new version is released.

* merge with failure - in process of resolving

* ci: add pixi to CI workflow (#177)

* add pymake function to add syslibs option for Darwin + gcc toolchain + CLT > 14.*

* update(mfusg): update gsi mfusg version (#178)

* merge with failing gridgent test on MacOS with intel

* build(deps): bump dawidd6/action-download-artifact from 5 to 6 (#179)

* ci(triggers): add concurrency groups to prevent duplicate runs (#180)

* ci(macos): use xcode clt 14.3.1 for intel c++ compiler compatibility (#181)

* gridgen build fails with newer versions of xcode

* ci: update workflows (#183)

* update request ci to use pixi

* Version 1.2.10 (#185)

* Update release.yml

* ci(release): set version to 1.2.10

---------

Co-authored-by: jdhughes-usgs <[email protected]>
Co-authored-by: wpbonelli <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants