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.

Sign up for GitHub

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

msys2 package list clean out and brew gcc update to v14. #358

Closed
wants to merge 6 commits into from
Closed

msys2 package list clean out and brew gcc update to v14. #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9a6cec
more robust macro to check for windows
drbergman Jan 15, 2025
d73c253
Merge pull request #352 from drbergman/better-windows-macros
MathCancer Jan 20, 2025
dbd3499
Merge pull request #354 from MathCancer/development
MathCancer Jan 20, 2025
eb5e511
first commit
heberlr Jan 31, 2025
69a23db
revert back to 1.14.2 state (but different hash)
drbergman Jan 31, 2025
d38f1a8
@ workflow : clean out msys2 package list and update brew gcc to v14.
elmbeech Feb 3, 2025
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
18 changes: 9 additions & 9 deletions .github/workflows/build_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- uses: msys2/setup-msys2@v2
with:
update: true
install: mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-headers-git mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-lapack mingw-w64-x86_64-openblas mingw-w64-x86_64-libxml2 mingw-w64-x86_64-bzip2 mingw-w64-x86_64-python mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-python-cffi make bison flex mingw-w64-x86_64-ca-certificates
install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-ca-certificates

- name: Build ${{ matrix.projects.name }} project
run: |
Expand Down Expand Up @@ -134,10 +134,10 @@ jobs:

- name: Install dependencies
run : |
if ! brew list gcc@13 &>/dev/null; then
brew install gcc@13
if ! brew list gcc@14 &>/dev/null; then
brew install gcc@14
else
echo "gcc@13 is already installed."
echo "gcc@14 is already installed."
fi

- name: Build ${{ matrix.projects.name }} project
Expand All @@ -146,7 +146,7 @@ jobs:
make ${{ matrix.projects.project }}
make clean
${{ matrix.projects.extra_run }}
make PHYSICELL_CPP=g++-13 static
make PHYSICELL_CPP=g++-14 static
cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macos13

- name: Caching produced project binary
Expand Down Expand Up @@ -184,10 +184,10 @@ jobs:

- name: Install dependencies
run : |
if ! brew list gcc@13 &>/dev/null; then
brew install gcc@13
if ! brew list gcc@14 &>/dev/null; then
brew install gcc@14
else
echo "gcc@13 is already installed."
echo "gcc@14 is already installed."
fi

- name: Build ${{ matrix.projects.name }} project
Expand All @@ -196,7 +196,7 @@ jobs:
make ${{ matrix.projects.project }}
make clean
${{ matrix.projects.extra_run }}
make PHYSICELL_CPP=g++-13 static
make PHYSICELL_CPP=g++-14 static
cp ${{ matrix.projects.binary }} ${{ matrix.projects.binary }}_macosm1

- name: Caching produced project binary
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
matrix:
os: [
{name: "Ubuntu", os: "ubuntu-latest", shell: "bash", compiler: "g++"},
{name: "MacOS 13", os: "macos-13", shell: "bash", compiler: "g++-12"},
{name: "MacOS 14 (M1)", os: "macos-14", shell: "bash", compiler: "g++-13"},
{name: "MacOS 13", os: "macos-13", shell: "bash", compiler: "g++-14"},
{name: "MacOS 14 (M1)", os: "macos-14", shell: "bash", compiler: "g++-14"},
{name: "Windows", os: "windows-latest", shell: "msys2", compiler: "g++"},
]
projects: [
Expand Down Expand Up @@ -52,8 +52,8 @@ jobs:
uses: msys2/setup-msys2@v2
with:
update: true
install: mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-headers-git mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-lapack mingw-w64-x86_64-openblas mingw-w64-x86_64-libxml2 mingw-w64-x86_64-bzip2 mingw-w64-x86_64-python mingw-w64-x86_64-python-zstandard mingw-w64-x86_64-python-cffi make bison flex mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils
install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-imagemagick mingw-w64-x86_64-ffmpeg unzip zip git mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-diffutils

- name: Build ${{ matrix.projects.name }} project
run: |
make data-cleanup && make ${{ matrix.projects.project }} && make PHYSICELL_CPP=${{ matrix.os.compiler }} PROGRAM_NAME=${{ matrix.projects.binary }}
Expand Down
2 changes: 1 addition & 1 deletion modules/PhysiCell_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ bool create_directories(const std::string &path)

bool create_directory(const std::string &path)
{
#if defined(__MINGW32__) || defined(__MINGW64__)
#if defined(_WIN32)
bool success = mkdir(path.c_str()) == 0;
#else
bool success = mkdir(path.c_str(), 0755) == 0;
Expand Down