Fixup build

janekbaraniewski · Apr 28, 2024 · 5e91eeb · 5e91eeb
1 parent 5d45c6d
commit 5e91eeb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,12 +48,9 @@ jobs:
       uses: lukka/get-cmake@latest
 
     - name: Configure CMake
-      run: |
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_ARCHITECTURE_ID=${{ matrix.config.arch }}
-
-    - name: Build
-      run: |
-        cmake --build build --config Release
+      run: make build
+      env:
+        CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_ARCHITECTURE_ID=${{ matrix.config.arch }}
 
     - name: Archive Server Production Artifacts
       uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -2,6 +2,7 @@ BUILD_DIR = build
 REPO = ghcr.io/janekbaraniewski/ser2net2ser
 VERSION ?= latest
 COMMIT_HASH ?= $(shell git rev-parse --short HEAD)
+CMAKE_FLAGS ?= -DCMAKE_BUILD_TYPE=Release
 
 help:  ## Show this help message
 	@echo "Usage: make [target]"
@@ -14,7 +15,7 @@ clean: ## Clean build directory
 
 build: ## Build with cmake
 build: clean
-	@cmake -S . -B build
+	@cmake -S . -B build $(CMAKE_FLAGS)
 	@cmake --build build
 
 test: ## Build and test