Skip to content

Commit f18ff90

Browse files
committed
Build for arm linux too, cleanup
1 parent 36a5439 commit f18ff90

File tree

2 files changed

+36
-91
lines changed

2 files changed

+36
-91
lines changed

.github/workflows/binary-build.yml

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414
fail-fast: false
1515

1616
matrix:
17-
os: [ubuntu-latest, macos-14]
17+
os: [ubuntu-latest, macos-14, ubuntu-24.04-arm]
1818
build_type: [Release]
1919
staticcompile: [ON, OFF]
2020
c_compiler: [gcc]
2121
cpp_compiler: [g++]
2222

2323
steps:
24-
25-
- name: Install help2man for Linux
26-
if: matrix.os == 'ubuntu-latest'
24+
25+
- name: Install dependencies for Linux
26+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm'
2727
run: sudo apt-get update && sudo apt-get install -yq help2man libgmp-dev
28-
28+
2929
- name: Install gmp for Mac
3030
if: matrix.os == 'macos-13'
31-
run: |
31+
run: |
3232
HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
3333
wget https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz
3434
tar xf gmp-6.3.0.tar.xz
@@ -40,26 +40,26 @@ jobs:
4040
4141
- name: Install zlib for Mac dynamic
4242
if: matrix.os == 'macos-14' && matrix.staticcompile == 'OFF'
43-
run: |
43+
run: |
4444
wget https://www.zlib.net/zlib-1.3.1.tar.gz
4545
tar xzvf zlib-1.3.1.tar.gz
4646
cd zlib-1.3.1
4747
./configure
4848
make -j8
4949
sudo make install
5050
cd ..
51-
51+
5252
- name: Install zlib for Mac static
5353
if: matrix.os == 'macos-14' && matrix.staticcompile == 'ON'
54-
run: |
54+
run: |
5555
wget https://www.zlib.net/zlib-1.3.1.tar.gz
5656
tar xzvf zlib-1.3.1.tar.gz
5757
cd zlib-1.3.1
5858
./configure --static
5959
make -j8
6060
sudo make install
6161
cd ..
62-
62+
6363
- name: Installing Numpy
6464
run: |
6565
pip install pip --upgrade
@@ -71,7 +71,7 @@ jobs:
7171
repository: meelgroup/cadical
7272
ref: mate-only-libraries-1.8.0
7373
path: cadical
74-
74+
7575
- name: Build Cadical
7676
run: |
7777
cd cadical
@@ -85,48 +85,57 @@ jobs:
8585
repository: meelgroup/cadiback
8686
ref: synthesis
8787
path: cadiback
88-
88+
8989
- name: Build Cadiback
9090
run: |
9191
cd cadiback
9292
CXX=c++ ./configure
9393
make -j8
9494
cd ..
95-
95+
9696
- name: checkout
97-
uses: actions/checkout@v4.1.1
97+
uses: actions/checkout@v4
9898
with:
99-
path: cryptominisat
100-
101-
- name: Add git submodules for Linux only (not needed for non-testing)
102-
working-directory: cryptominisat
103-
if: matrix.os == 'ubuntu-latest'
104-
run: git submodule update --init
99+
path: project
100+
submodules: 'true'
105101

106102
- name: Configure & build
107103
run: |
108-
cd cryptominisat
104+
cd project
109105
mkdir -p build && cd build
110-
cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTING=OFF -DSTATICCOMPILE=${{ matrix.staticcompile }} ..
111-
cmake --build . --config ${{ matrix.build_type }}
106+
cmake \
107+
-DENABLE_TESTING=OFF \
108+
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
109+
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
110+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
111+
-DSTATICCOMPILE=${{ matrix.staticcompile }} \
112+
-S ..
113+
cmake --build . --config ${{matrix.build_type}} -v
112114
113115
- name: Upload Artifact - Linux
114116
if: matrix.os == 'ubuntu-latest' && matrix.staticcompile == 'ON'
115117
uses: actions/upload-artifact@v4
116118
with:
117119
name: cryptominisat5-linux-amd64
118-
path: cryptominisat/build/cryptominisat5
119-
120+
path: project/build/cryptominisat5
121+
122+
- name: Upload Artifact - Linux arm
123+
if: matrix.os == 'ubuntu-24.04-arm' && matrix.staticcompile == 'ON'
124+
uses: actions/upload-artifact@v4
125+
with:
126+
name: cryptominisat-linux-arm64
127+
path: project/build/cryptominisat5
128+
120129
- name: Upload Artifact - Mac
121130
if: matrix.os == 'macos-14' && matrix.staticcompile == 'ON'
122131
uses: actions/upload-artifact@v4
123132
with:
124133
name: cryptominisat5-mac-arm64
125-
path: cryptominisat/build/cryptominisat5
134+
path: project/build/cryptominisat5
126135

127136
- name: Upload Artifact - Windows
128137
if: matrix.os == 'windows-2022' && matrix.staticcompile == 'ON'
129138
uses: actions/upload-artifact@v4
130139
with:
131140
name: cryptominisat5-win64.exe
132-
path: cryptominisat\build\Release\cryptominisat5.exe
141+
path: project\build\Release\cryptominisat5.exe

.github/workflows/python-wheel-build.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)