Skip to content

Commit 8223c91

Browse files
committed
CI: Split out cmake-build.yml from build.yml
1 parent 9be48f6 commit 8223c91

File tree

2 files changed

+49
-48
lines changed

2 files changed

+49
-48
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: libbinio CI
1+
name: libbinio autotools CI
22

33
on:
44
- push
@@ -19,12 +19,6 @@ jobs:
1919
os: ubuntu-latest
2020
- compiler: djgpp-2.0.5-gcc-4.8.5 # To test compatibility for Adplay - DOS
2121
os: ubuntu-latest
22-
- compiler: cmake
23-
os: ubuntu-latest
24-
- compiler: cmake
25-
os: macos-latest
26-
- compiler: cmake
27-
os: windows-latest
2822

2923
fail-fast: false
3024

@@ -33,8 +27,8 @@ jobs:
3327
steps:
3428
- uses: actions/checkout@v3
3529

36-
- name: Install packages (autotools, Linux)
37-
if: ${{ runner.os == 'Linux' && matrix.compiler != 'cmake'}}
30+
- name: Install packages (Linux)
31+
if: ${{ runner.os == 'Linux' }}
3832
run: |
3933
sudo apt update
4034
sudo apt install -y texlive-latex-base texinfo
@@ -69,8 +63,8 @@ jobs:
6963
fi
7064
fi
7165
72-
- name: Install packages (autotools, macOS)
73-
if: ${{ runner.os == 'macOS' && matrix.compiler != 'cmake'}}
66+
- name: Install packages (macOS)
67+
if: ${{ runner.os == 'macOS' }}
7468
run: |
7569
# Allow core dumps
7670
sudo sh -c 'touch /cores/test && rm /cores/test && chmod -R 0777 /cores'
@@ -79,39 +73,37 @@ jobs:
7973
#brew install --cask mactex-no-gui
8074
brew install automake libtool texinfo
8175
82-
- name: Install LLVM and Clang (autotools)
76+
- name: Install LLVM and Clang
8377
if: ${{ matrix.compiler == 'clang' && runner.os != 'macOS'}}
8478
uses: KyleMayes/install-llvm-action@v1
8579
with:
8680
version: "10.0"
8781

88-
- name: Set GCC-4.8 environment (autotools)
82+
- name: Set GCC-4.8 environment
8983
if: ${{ matrix.compiler == 'gcc-4.8' }}
9084
run: echo 'compile_opts=CC=gcc-4.8 CXX=g++-4.8' >> $GITHUB_ENV
9185

92-
- name: Set GCC environment (autotools)
86+
- name: Set GCC environment
9387
if: ${{ matrix.compiler == 'gcc' && runner.os == 'macOS' }}
9488
run: echo 'compile_opts=CC=gcc CXX=g++' >> $GITHUB_ENV
9589

96-
- name: Set Clang environment (autotools)
90+
- name: Set Clang environment
9791
if: ${{ matrix.compiler == 'clang' }}
9892
run: echo 'compile_opts=CC=clang CXX=clang++' >> $GITHUB_ENV
9993

100-
- name: Set DJGPP environment (autotools)
94+
- name: Set DJGPP environment
10195
if: ${{ startsWith(matrix.compiler, 'djgpp') }}
10296
run: |
10397
echo 'compile_opts=--host=i586-pc-msdosdjgpp --prefix=/usr/local/djgpp CXXFLAGS=-Wno-deprecated CPPFLAGS=-Wno-deprecated PKG_CONFIG_PATH=/usr/local/djgpp/lib/pkgconfig' >> $GITHUB_ENV
10498
echo 'usr/local//djgpp/bin/' >> $GITHUB_PATH
10599
106-
- name: autoreconf (autotools)
107-
if: ${{matrix.compiler != 'cmake'}}
100+
- name: autoreconf
108101
run: autoreconf -i
109-
- name: configure (autotools)
110-
if: ${{matrix.compiler != 'cmake'}}
102+
103+
- name: configure
111104
run: ./configure ${{ env.compile_opts }} || cat config.log
112105

113-
- name: make (autotools)
114-
if: ${{matrix.compiler != 'cmake'}}
106+
- name: make
115107
run: |
116108
ulimit -c unlimited -S
117109
if [[ ${{ runner.os }} == "macOS" ]]; then
@@ -131,30 +123,6 @@ jobs:
131123
make distcheck ${{ env.compile_opts }}
132124
fi
133125
134-
- name: Prepare test results (autotools, Linux)
135-
if: ${{ runner.os == 'Linux' && !startsWith(matrix.compiler, 'djgpp') && matrix.compiler != 'cmake'}}
126+
- name: Prepare test results (Linux)
127+
if: ${{ runner.os == 'Linux' && !startsWith(matrix.compiler, 'djgpp') }}
136128
run: make check
137-
138-
- name: Get cmake and ninja (cmake)
139-
if: ${{matrix.compiler == 'cmake'}}
140-
uses: lukka/get-cmake@latest
141-
142-
- name: Find MSVC (cmake on Windows)
143-
if: ${{matrix.compiler == 'cmake'}}
144-
uses: ilammy/msvc-dev-cmd@v1
145-
146-
- name: Checkout repository (cmake)
147-
if: ${{matrix.compiler == 'cmake'}}
148-
uses: actions/checkout@v3
149-
with:
150-
fetch-depth: 0
151-
152-
- name: Build (cmake)
153-
if: ${{matrix.compiler == 'cmake'}}
154-
uses: lukka/run-cmake@v10
155-
env:
156-
VCPKG_ROOT:
157-
# workaround for https://github.com/lukka/run-cmake/issues/142
158-
with:
159-
configurePreset: shared
160-
buildPreset: shared

.github/workflows/cmake-build.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: libbinio CMake CI
2+
3+
on: [ push, pull_request, workflow_dispatch ]
4+
5+
jobs:
6+
build:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
os: [ 'windows-latest', 'ubuntu-latest', 'macos-latest' ]
11+
12+
runs-on: ${{matrix.os}}
13+
14+
steps:
15+
- name: Get cmake and ninja
16+
uses: lukka/get-cmake@latest
17+
18+
- name: Find MSVC (on Windows)
19+
uses: ilammy/msvc-dev-cmd@v1
20+
21+
- name: Checkout libbinio repository
22+
uses: actions/checkout@v3
23+
with:
24+
fetch-depth: 0
25+
26+
- name: Build libbinio
27+
uses: lukka/run-cmake@v10
28+
env:
29+
VCPKG_ROOT:
30+
# workaround for https://github.com/lukka/run-cmake/issues/142
31+
with:
32+
configurePreset: shared
33+
buildPreset: shared

0 commit comments

Comments
 (0)