projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21204: Change log sorter to preserve ordering of same-timestamped lines of a
[arvados.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2ca5e79a18cff60bff655c6d3cdb9938494b5785..c7a9cbfb8ea514e40017a0ae77515c54d6afe065 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-36,6
+36,7
@@
DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
# redHat package file
RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
# redHat package file
RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
+GOPATH=$(shell go env GOPATH)
export WORKSPACE?=$(shell pwd)
.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
export WORKSPACE?=$(shell pwd)
.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
@@
-66,10
+67,11
@@
arvados-server-install: check-arvados-directory
cd $(ARVADOS_DIRECTORY)
go mod download
cd cmd/arvados-server
cd $(ARVADOS_DIRECTORY)
go mod download
cd cmd/arvados-server
- go install
+ echo GOPATH is $(GOPATH)
+ GOFLAGS=-buildvcs=false go install
cd -
cd -
- ls -l
~/go
/bin/arvados-server
-
~/go
/bin/arvados-server install -type test
+ ls -l
$(GOPATH)
/bin/arvados-server
+
$(GOPATH)
/bin/arvados-server install -type test
yarn-install: arvados-server-install
yarn install
yarn-install: arvados-server-install
yarn install
@@
-87,6
+89,9
@@
integration-tests-in-docker: workbench2-build-image check-arvados-directory
unit-tests-in-docker: workbench2-build-image check-arvados-directory
docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
unit-tests-in-docker: workbench2-build-image check-arvados-directory
docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
+tests-in-docker: workbench2-build-image check-arvados-directory
+ docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
+
test: unit-tests integration-tests
build: yarn-install
test: unit-tests integration-tests
build: yarn-install
@@
-146,12
+151,15
@@
packages-in-docker: check-arvados-directory workbench2-build-image
docker run --env ci="true" \
--env ARVADOS_DIRECTORY=/tmp/arvados \
--env APP_NAME=${APP_NAME} \
docker run --env ci="true" \
--env ARVADOS_DIRECTORY=/tmp/arvados \
--env APP_NAME=${APP_NAME} \
+ --env VERSION="${VERSION}" \
--env ITERATION=${ITERATION} \
--env TARGETS="${TARGETS}" \
--env ITERATION=${ITERATION} \
--env TARGETS="${TARGETS}" \
+ --env MAINTAINER="${MAINTAINER}" \
+ --env DESCRIPTION="${DESCRIPTION}" \
-w="/tmp/workbench2" \
-t -v ${WORKSPACE}:/tmp/workbench2 \
-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-w="/tmp/workbench2" \
-t -v ${WORKSPACE}:/tmp/workbench2 \
-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
- make packages
+ sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
workbench2-build-image:
(cd docker && docker build -t workbench2-build .)
workbench2-build-image:
(cd docker && docker build -t workbench2-build .)