APP_NAME?=arvados-workbench2
-# GIT_TAG is the last tagged stable release (i.e. 1.2.0)
-GIT_TAG?=$(shell git describe --abbrev=0)
-
-# TS_GIT is the timestamp in the current directory (i.e. 1528815021).
-# Note that it will only change if files change.
-TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
-
-# DATE_FROM_TS_GIT is the human(ish)-readable version of TS_GIT
-# 1528815021 -> 20180612145021
-DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
-
# VERSION uses all the above to produce X.Y.Z.timestamp
# something in the lines of 1.2.0.20180612145021, this will be the package version
# it can be overwritten when invoking make as in make packages VERSION=1.2.0
-VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
+VERSION?=$(shell ./version-at-commit.sh HEAD)
+# We don't use BUILD_NUMBER at the moment, but it needs to be defined
+BUILD_NUMBER?=0
+GIT_COMMIT?=$(shell git rev-parse --short HEAD)
# ITERATION is the package iteration, intended for manual change if anything non-code related
# changes in the package. (i.e. example config files externally added
ITERATION?=1
+TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
+
+ARVADOS_DIRECTORY?=unset
+
DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
-MAINTAINER=Ward Vandewege <wvandewege@veritasgenetics.com>
+MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
# DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/arvados-workbench2/workbench2/
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
# Debian package file
DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
# 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
+.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
help:
@echo >&2
clean: clean-rpm clean-deb clean-node-modules
-yarn-install:
+arvados-server-install: check-arvados-directory
+ cd $(ARVADOS_DIRECTORY)
+ go mod download
+ cd cmd/arvados-server
+ echo GOPATH is $(GOPATH)
+ GOFLAGS=-buildvcs=false go install
+ cd -
+ ls -l $(GOPATH)/bin/arvados-server
+ $(GOPATH)/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
yarn install
-test: yarn-install
- yarn test --watchAll --bail --ci
+unit-tests: yarn-install
+ yarn test --no-watchAll --bail --ci
+
+integration-tests: yarn-install check-arvados-directory
+ yarn run cypress install
+ $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
-build: test
- yarn build
+integration-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 integration-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
+ VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
$(DEB_FILE): build
fpm \
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
+ --vendor="The Arvados Authors" \
--maintainer="$(MAINTAINER)" \
+ --url="https://arvados.org" \
+ --license="GNU Affero General Public License, version 3.0" \
--description="$(DESCRIPTION)" \
- --config-files="etc/arvados/workbench2/workbench2.example.json" \
- $(WORKSPACE)/build/=$(DEST_DIR)
+ --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+ $(WORKSPACE)/build/=$(DEST_DIR) \
+ etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
$(RPM_FILE): build
fpm \
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
+ --vendor="The Arvados Authors" \
--maintainer="$(MAINTAINER)" \
+ --url="https://arvados.org" \
+ --license="GNU Affero General Public License, version 3.0" \
--description="$(DESCRIPTION)" \
- --config-files="etc/arvados/workbench2/workbench2.example.json" \
- $(WORKSPACE)/build/=$(DEST_DIR)
+ --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
+ $(WORKSPACE)/build/=$(DEST_DIR) \
+ etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
copy: $(DEB_FILE) $(RPM_FILE)
for target in $(TARGETS); do \
- if [[ $$target =~ ^centos ]]; then
- cp -p $(RPM_FILE) packages/$$target ; \
- else
- cp -p $(DEB_FILE) packages/$$target ; \
- fi
- done
- rm -f $(RPM_FILE)
- rm -f $(DEB_FILE)
+ mkdir -p "packages/$$target" && \
+ case "$$target" in \
+ centos*|rocky*) cp -p "$(RPM_FILE)" "packages/$$target" ;; \
+ debian*|ubuntu*) cp -p "$(DEB_FILE)" "packages/$$target" ;; \
+ *) echo "Unknown copy target $$target"; exit 1 ;; \
+ esac ; \
+ done ; \
+ rm -f "$(DEB_FILE)" "$(RPM_FILE)"
# use FPM to create DEB and RPM
packages: copy
+
+check-arvados-directory:
+ @if test "${ARVADOS_DIRECTORY}" == "unset"; then echo "the environment variable ARVADOS_DIRECTORY must be set to the path of an arvados git checkout"; exit 1; fi
+ @if ! test -d "${ARVADOS_DIRECTORY}"; then echo "the environment variable ARVADOS_DIRECTORY does not point at a directory"; exit 1; fi
+
+packages-in-docker: check-arvados-directory workbench2-build-image
+ 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 MAINTAINER="${MAINTAINER}" \
+ --env DESCRIPTION="${DESCRIPTION}" \
+ -w="/tmp/workbench2" \
+ -t -v ${WORKSPACE}:/tmp/workbench2 \
+ -v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
+ sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
+
+workbench2-build-image:
+ (cd docker && docker build -t workbench2-build .)
projects / arvados-workbench2.git / blobdiff