Skip to content

Commit

Permalink
"mvn" command executed in Docker container should not be configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
bertfrees committed May 3, 2024
1 parent dabee24 commit de42ae1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ clean :
$(MVN) clean

$(TARGET_NAR_LINUX_32) :
$(COMPOSE) run debian $(MVN) test -Dos.arch=i386
$(COMPOSE) run debian mvn test -Dos.arch=i386

$(TARGET_NAR_LINUX_64) :
$(COMPOSE) run debian $(MVN) test
$(COMPOSE) run debian mvn test

$(TARGET_NAR_MAC_32) :
[[ "$$(uname -s)" == Darwin ]]
Expand All @@ -47,10 +47,10 @@ $(TARGET_NAR_MAC_ARM64) :
target/nar/louis-$(VERSION)-aarch64-MacOSX-gpp-shared/lib/aarch64-MacOSX-gpp/shared/

$(TARGET_NAR_WIN_32) :
$(COMPOSE) run debian $(MVN) test -Pcross-compile -Dhost.os=w64-mingw32 -Dos.arch=i686
$(COMPOSE) run debian mvn test -Pcross-compile -Dhost.os=w64-mingw32 -Dos.arch=i686

$(TARGET_NAR_WIN_64) :
$(COMPOSE) run debian $(MVN) test -Pcross-compile -Dhost.os=w64-mingw32 -Dos.arch=x86_64
$(COMPOSE) run debian mvn test -Pcross-compile -Dhost.os=w64-mingw32 -Dos.arch=x86_64

snapshot :
[[ $(VERSION) == *-SNAPSHOT ]]
Expand Down

0 comments on commit de42ae1

Please sign in to comment.