flucky/PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(Makefile, travis): define correct make steps

Browse Source
This commit is contained in:
Markus Pesch 2019-09-04 14:04:02 +02:00
parent 4e531b8734
commit bacddcfbf9
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,13 +6,11 @@ services:
jobs: jobs:
include: include:
- stage: build - stage: build
name: go-build
script: make container-run/all script: make container-run/all
deploy: deploy:
- provider: script - provider: script
script: make container-run/release/all script: make container-run/release/all
# skip_cleanup: true
on: on:
tags: true tags: true

24
Makefile
View File

@ -230,59 +230,59 @@ container-image/push/amd64: container-image/build/amd64
# current os # current os
PHONY+=container-run/${EXECUTABLE} PHONY+=container-run/${EXECUTABLE}
container-run/${EXECUTABLE}: container-run/${EXECUTABLE}:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# build all binaries for any operating system # build all binaries for any operating system
PHONY+=container-run/all PHONY+=container-run/all
container-run/all: container-run/all:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
PHONY+=${UNIX_EXECUTABLE_TARGETS:%=container-run/%} PHONY+=${UNIX_EXECUTABLE_TARGETS:%=container-run/%}
${UNIX_EXECUTABLE_TARGETS:%=container-run/%}: ${UNIX_EXECUTABLE_TARGETS:%=container-run/%}:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# CONTAINER STEPS - GO-BINDATA # CONTAINER STEPS - GO-BINDATA
# ============================================================================== # ==============================================================================
PHONY+=container-run/bindata PHONY+=container-run/bindata
container-run/bindata: container-run/bindata:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# CONTAINER STEPS - TEST # CONTAINER STEPS - TEST
# ============================================================================== # ==============================================================================
PHONY+=container-run/test PHONY+=container-run/test
container-run/test: container-run/test:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
PHONY+=container-run/test-update-all PHONY+=container-run/test-update-all
container-run/test-update-all: container-run/test-update-all:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# CONTAINER STEPS - COMPRESSED BINARIES AND PACKAGES # CONTAINER STEPS - COMPRESSED BINARIES AND PACKAGES
# ============================================================================== # ==============================================================================
PHONY+=${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%} PHONY+=${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}
${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}: ${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
PHONY+=${RPM_EXECUTABLE_TARGETS:%=container-run/%} PHONY+=${RPM_EXECUTABLE_TARGETS:%=container-run/%}
${RPM_EXECUTABLE_TARGETS:%=container-run/%}: ${RPM_EXECUTABLE_TARGETS:%=container-run/%}:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# CONTAINER STEPS - RELEASE COMPRESSED BINARIES AND PACKAGES # CONTAINER STEPS - RELEASE COMPRESSED BINARIES AND PACKAGES
# ============================================================================== # ==============================================================================
PHONY+=${RELEASE_EXECUTABLE_TARGETS%=container-run/%} PHONY+=${RELEASE_EXECUTABLE_TARGETS%=container-run/%}
${RELEASE_EXECUTABLE_TARGETS:%=container-run/%}: ${RELEASE_EXECUTABLE_TARGETS:%=container-run/%}:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# CONTAINER STEPS - OTHER STUF # CONTAINER STEPS - OTHER STUF
# ============================================================================== # ==============================================================================
PHONY+=container-run/clean PHONY+=container-run/clean
container-run/clean: container-run/clean:
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@) $(MAKE) container-run COMMAND=$(subst container-run/,,$@)
# GENERAL CONTAINER COMMAND # GENERAL CONTAINER COMMAND
# ============================================================================== # ==============================================================================
PHONY+=container-run/ PHONY+=container-run
container-run/: container-run:
${CONTAINER_RUNTIME} run \ ${CONTAINER_RUNTIME} run \
--rm \ --rm \
--volume ${PWD}:/workspace \ --volume ${PWD}:/workspace \