Skip to content

Commit 5e91eeb

Browse files
Fixup build
1 parent 5d45c6d commit 5e91eeb

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ jobs:
4848
uses: lukka/get-cmake@latest
4949

5050
- name: Configure CMake
51-
run: |
52-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_ARCHITECTURE_ID=${{ matrix.config.arch }}
53-
54-
- name: Build
55-
run: |
56-
cmake --build build --config Release
51+
run: make build
52+
env:
53+
CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_ARCHITECTURE_ID=${{ matrix.config.arch }}
5754

5855
- name: Archive Server Production Artifacts
5956
uses: actions/upload-artifact@v3

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ BUILD_DIR = build
22
REPO = ghcr.io/janekbaraniewski/ser2net2ser
33
VERSION ?= latest
44
COMMIT_HASH ?= $(shell git rev-parse --short HEAD)
5+
CMAKE_FLAGS ?= -DCMAKE_BUILD_TYPE=Release
56

67
help: ## Show this help message
78
@echo "Usage: make [target]"
@@ -14,7 +15,7 @@ clean: ## Clean build directory
1415

1516
build: ## Build with cmake
1617
build: clean
17-
@cmake -S . -B build
18+
@cmake -S . -B build $(CMAKE_FLAGS)
1819
@cmake --build build
1920

2021
test: ## Build and test

0 commit comments

Comments
 (0)