Skip to content

Commit

Permalink
update build_osx_x86.yml, add build_osx_M.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
rcedgar committed Aug 22, 2024
1 parent 48b24a4 commit 7ddecac
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 11 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/build_osx_M.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: build-osx-M

on:
workflow_dispatch:

jobs:
build:
runs-on: macos-14

steps:
# Checks-out the repository under $GITHUB_WORKSPACE
- uses: actions/checkout@v4

# Install MacPorts (new step)
- uses: melusina-org/setup-macports@v1

# Install ccache using port (optional, adjust as needed)
- name: Install ccache
run: |
sudo port install python311
/bin/bash -c "$(curl -fsSL https://github.com/raw/Homebrew/install/HEAD/install.sh)"
brew update
brew install gcc@11
# Runs a set of commands using the runner's shell
- name: Build-commands
run: |
echo Starting Build-commands
echo GITHUB_WORKSPACE=$GITHUB_WORKSPACE
uname -a
cd $GITHUB_WORKSPACE
ls -lh
cd src
curl -fsSL https://github.com/raw/rcedgar/vcxproj_make/806d016/vcxproj_make.py >./vcxproj_make.py
chmod u+x ./vcxproj_make.py
./vcxproj_make.py --openmp --cppcompiler g++-11
pwd
- name: Upload binary artifact
uses: actions/upload-artifact@v4
with:
name: muscle-osx-binary-m
path: /Users/runner/work/muscle/muscle/bin/muscle
- name: Upload make.stderr artifact
uses: actions/upload-artifact@v4
with:
name: make.stderr-osx-m
path: /Users/runner/work/muscle/muscle/src/make.stderr
- name: Upload make.stdout artifact
uses: actions/upload-artifact@v4
with:
name: make.stdout-osx-m
path: /Users/runner/work/muscle/muscle/src/make.stdout

20 changes: 11 additions & 9 deletions .github/workflows/build_osx_x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
# Install ccache using port (optional, adjust as needed)
- name: Install ccache
run: |
sudo port install ccache
sudo port install python311
/bin/bash -c "$(curl -fsSL https://github.com/raw/Homebrew/install/HEAD/install.sh)"
brew update
brew install gcc@11
# Runs a set of commands using the runner's shell
- name: Build-commands
Expand All @@ -29,23 +31,23 @@ jobs:
cd $GITHUB_WORKSPACE
ls -lh
cd src
chmod u+x ./build_linux.bash
chmod u+x ./build_linux.py
./build_linux.bash
curl -fsSL https://github.com/raw/rcedgar/vcxproj_make/806d016/vcxproj_make.py >./vcxproj_make.py
chmod u+x ./vcxproj_make.py
./vcxproj_make.py --openmp --cppcompiler g++-11
pwd
- name: Upload binary artifact
uses: actions/upload-artifact@v4
with:
name: muscle-osx-binary
name: muscle-osx-binary_x86
path: /Users/runner/work/muscle/muscle/bin/muscle
- name: Upload make.stderr artifact
uses: actions/upload-artifact@v4
with:
name: make.stderr-osx
path: /Users/runner/work/muscle/muscle/bin/muscle.stderr
name: make.stderr-osx_x86
path: /Users/runner/work/muscle/muscle/src/make.stderr
- name: Upload make.stdout artifact
uses: actions/upload-artifact@v4
with:
name: make.stdout-osx
path: /Users/runner/work/muscle/muscle/bin/muscle.stdout
name: make.stdout-osx_x86
path: /Users/runner/work/muscle/muscle/src/make.stdout

4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ OBJDIR := o
BINPATH := $(BINDIR)/muscle

CXX = g++
CXXFLAGS := $(CFLAGS) -ffast-math -march=native -O3 -DNDEBUG -fopenmp
CXXFLAGS := $(CFLAGS) -ffast-math -march=native -O3 -DNDEBUG

UNAME_S := $(shell uname -s)
LDFLAGS := $(LDFLAGS) -ffast-math -march=native -O3 -fopenmp
LDFLAGS := $(LDFLAGS) -ffast-math -march=native -O3
ifeq ($(UNAME_S),Linux)
LDFLAGS += -static
endif
Expand Down

0 comments on commit 7ddecac

Please sign in to comment.