Fix build on Windows: "mvn" executable does not exist

It can only be used instead of mvn.cmd when run in a shell.
daisy · Dec 9, 2022 · 84a43ab · 84a43ab
1 parent f12e1bd
commit 84a43ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,6 +24,6 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
-    - name: Build .deb file
+    - name: Build Windows ZIP distribution
       shell: cmd
-      run: .\\make.exe deb
+      run: .\\make.exe zip-win
diff --git a/Makefile b/Makefile
@@ -9,10 +9,15 @@ SHELL := make/eval-java
 endif
 .SHELLFLAGS :=
 
+OS := $(shell println(getOS());)
+
+ifeq ($(OS), WINDOWS)
+MVN ?= mvn.cmd
+else
 MVN ?= mvn
-DOCKER := docker
+endif
 
-OS := $(shell println(getOS());)
+DOCKER := docker
 
 .PHONY : default
 ifeq ($(OS), WINDOWS)