diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 45d6af07..ce9948bf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,6 +24,13 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Build .deb file + + - name: find location of mvn.exe + shell: cmd + run: | + where mvn + path + + - name: Build Windows ZIP distribution shell: cmd - run: .\\make.exe deb + run: .\\make.exe zip-win diff --git a/Makefile b/Makefile index 6f7a6a77..b370d69d 100644 --- 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)