Skip to content

Commit 0e538eb

Browse files
leonlynchleonlynch
committed
Update Github Actions
Update all builds to use multi-line syntax for CMake configuration commands.
1 parent e2655d4 commit 0e538eb

File tree

4 files changed

+60
-8
lines changed

4 files changed

+60
-8
lines changed

‎.github/workflows/fedora-build.yaml

+14-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ jobs:
4949
git describe --always --dirty
5050
5151
- name: Configure CMake
52-
run: cmake -B build -DCMAKE_BUILD_TYPE="Debug" -DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} -DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
52+
run: |
53+
cmake -B build \
54+
-DCMAKE_BUILD_TYPE="Debug" \
55+
-DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} \
56+
-DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
5357
5458
- name: Build
5559
run: cmake --build build
@@ -92,7 +96,15 @@ jobs:
9296
run: echo "GIT_DESCRIBE=$(git describe --always --dirty)" >> $GITHUB_ENV
9397

9498
- name: Configure CMake
95-
run: cmake -B build -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=YES -DBUILD_DOCS=YES -DBUILD_EMV_TOOL=YES -DBUILD_EMV_VIEWER=YES -DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE
99+
run: |
100+
cmake -B build \
101+
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
102+
-DCMAKE_INSTALL_PREFIX=/usr \
103+
-DBUILD_SHARED_LIBS=YES \
104+
-DBUILD_DOCS=YES \
105+
-DBUILD_EMV_TOOL=YES \
106+
-DBUILD_EMV_VIEWER=YES \
107+
-DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE
96108
97109
- name: Build
98110
run: cmake --build build

‎.github/workflows/macos-build.yaml

+16-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ jobs:
6262
submodules: recursive
6363

6464
- name: Configure CMake
65-
run: cmake -B build -DCMAKE_OSX_ARCHITECTURES="${{ matrix.osx_arch }}" -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} -DFETCH_ARGP=${{ matrix.fetch_deps }} -DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} -DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
65+
run: |
66+
cmake -B build \
67+
-DCMAKE_OSX_ARCHITECTURES="${{ matrix.osx_arch }}" \
68+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" \
69+
-DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} \
70+
-DFETCH_ARGP=${{ matrix.fetch_deps }} \
71+
-DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} \
72+
-DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
6673
6774
- name: Build
6875
run: cmake --build build
@@ -94,7 +101,14 @@ jobs:
94101
run: echo "GIT_DESCRIBE=$(git describe --always --dirty)" >> $GITHUB_ENV
95102

96103
- name: Configure CMake
97-
run: cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DFETCH_ARGP=YES -DBUILD_EMV_TOOL=YES -DBUILD_EMV_VIEWER=YES -DBUILD_MACOSX_BUNDLE=YES
104+
run: |
105+
cmake -B build \
106+
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
107+
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
108+
-DFETCH_ARGP=YES \
109+
-DBUILD_EMV_TOOL=YES \
110+
-DBUILD_EMV_VIEWER=YES \
111+
-DBUILD_MACOSX_BUNDLE=YES
98112
99113
- name: Build
100114
run: cmake --build build

‎.github/workflows/ubuntu-build.yaml

+16-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ jobs:
4747
- run: git describe --always --dirty
4848

4949
- name: Configure CMake
50-
run: cmake -B build -DCMAKE_BUILD_TYPE="Debug" -DISO8859_IMPL=${{ matrix.iso8859 }} -DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} -DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
50+
run: |
51+
cmake -B build \
52+
-DCMAKE_BUILD_TYPE="Debug" \
53+
-DISO8859_IMPL=${{ matrix.iso8859 }} \
54+
-DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} \
55+
-DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
5156
5257
- name: Build
5358
run: cmake --build build
@@ -87,7 +92,16 @@ jobs:
8792
# intended Ubuntu release. The ppa1 component indicates that this is not
8893
# an official Ubuntu package. The release name component indicates that
8994
# this is for the specific Ubuntu release that has that name.
90-
run: cmake -B build -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=YES -DBUILD_DOCS=YES -DBUILD_EMV_TOOL=YES -DBUILD_EMV_VIEWER=YES -DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE -DCPACK_DEBIAN_PACKAGE_RELEASE="0ubuntu1~ppa1~${{ matrix.ubuntu_release_name }}1"
95+
run: |
96+
cmake -B build \
97+
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
98+
-DCMAKE_INSTALL_PREFIX=/usr \
99+
-DBUILD_SHARED_LIBS=YES \
100+
-DBUILD_DOCS=YES \
101+
-DBUILD_EMV_TOOL=YES \
102+
-DBUILD_EMV_VIEWER=YES \
103+
-DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE \
104+
-DCPACK_DEBIAN_PACKAGE_RELEASE="0ubuntu1~ppa1~${{ matrix.ubuntu_release_name }}1"
91105
92106
- name: Build
93107
run: cmake --build build

‎.github/workflows/windows-build.yaml

+14-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@ jobs:
7171
git describe --always --dirty
7272
7373
- name: Configure CMake
74-
run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} -DFETCH_ARGP=YES -DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} -DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
74+
run: |
75+
cmake -G Ninja -B build \
76+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" \
77+
-DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} \
78+
-DFETCH_ARGP=YES \
79+
-DBUILD_EMV_TOOL=${{ matrix.build_emv_tool }} \
80+
-DBUILD_EMV_VIEWER=${{ matrix.build_emv_viewer }}
7581
7682
- name: Build
7783
run: cmake --build build
@@ -134,7 +140,13 @@ jobs:
134140
echo "GIT_DESCRIBE=$(git describe --always --dirty)" >> $GITHUB_ENV
135141
136142
- name: Configure CMake
137-
run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DBUILD_SHARED_LIBS=YES -DFETCH_ARGP=YES -DBUILD_EMV_TOOL=YES -DBUILD_EMV_VIEWER=YES
143+
run: |
144+
cmake -G Ninja -B build \
145+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" \
146+
-DBUILD_SHARED_LIBS=YES \
147+
-DFETCH_ARGP=YES \
148+
-DBUILD_EMV_TOOL=YES \
149+
-DBUILD_EMV_VIEWER=YES
138150
# CMake will only accept Windows paths if they are environment variables, not CMake command line cache entries
139151
env:
140152
CMAKE_PREFIX_PATH: ${{ env.Qt6_DIR }}

0 commit comments

Comments
 (0)