From 1ce47af381ad5614ae11225e32f821102b13414e Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Fri, 13 Jun 2025 12:25:26 -0700 Subject: [PATCH 1/2] .github/workflows/dnmtools_build_macos.yml: added jobs to build with clang on macos --- .github/workflows/dnmtools_build_macos.yml | 40 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dnmtools_build_macos.yml b/.github/workflows/dnmtools_build_macos.yml index a75541cf..b12f820e 100644 --- a/.github/workflows/dnmtools_build_macos.yml +++ b/.github/workflows/dnmtools_build_macos.yml @@ -8,7 +8,7 @@ on: branches: [ "master" ] jobs: - build-on-x86: + build-with-gcc-on-x86: runs-on: macos-13 steps: - uses: actions/checkout@v4 @@ -26,7 +26,7 @@ jobs: run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" - name: make run: make -j4 - build-on-arm64: + build-with-gcc-on-arm64: runs-on: macos-15 steps: - uses: actions/checkout@v4 @@ -44,3 +44,39 @@ jobs: run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" - name: make run: make -j4 + build-with-clang-on-x86: + runs-on: macos-13 + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: Update Homebrew + run: brew update + - name: Install autotools + run: brew install automake + - name: Install dependencies + run: brew install htslib gsl + - name: Generate configure script + run: ./autogen.sh + - name: configure with clang++ + run: ./configure CXX="clang++" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" + - name: make + run: make -j4 + build-with-clang-on-arm64: + runs-on: macos-15 + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: Update Homebrew + run: brew update + - name: Install autotools + run: brew install automake + - name: Install dependencies + run: brew install htslib gsl + - name: Generate configure script + run: ./autogen.sh + - name: configure with clang++ + run: ./configure CXX="clang++" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" + - name: make + run: make -j4 From b18b4fa3060fb1606a41368c93dfbc66700a2575 Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Fri, 13 Jun 2025 12:38:10 -0700 Subject: [PATCH 2/2] .github/workflows/dnmtools_build_macos.yml: removing the clang build for x86 because the to_chars is absent in macos-13 default libs (message says added in macos-13.3) --- .github/workflows/dnmtools_build_macos.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/dnmtools_build_macos.yml b/.github/workflows/dnmtools_build_macos.yml index b12f820e..2adda8fc 100644 --- a/.github/workflows/dnmtools_build_macos.yml +++ b/.github/workflows/dnmtools_build_macos.yml @@ -44,24 +44,6 @@ jobs: run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" - name: make run: make -j4 - build-with-clang-on-x86: - runs-on: macos-13 - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Update Homebrew - run: brew update - - name: Install autotools - run: brew install automake - - name: Install dependencies - run: brew install htslib gsl - - name: Generate configure script - run: ./autogen.sh - - name: configure with clang++ - run: ./configure CXX="clang++" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" - - name: make - run: make -j4 build-with-clang-on-arm64: runs-on: macos-15 steps: