Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

Include hack directory in build output. Allow version to be configured #59

Merged
owainlewis merged 1 commit into from
Mar 22, 2018
Merged

Include hack directory in build output. Allow version to be configured #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ USE_GLOBAL_NAMESPACE ?= false
ifdef WERCKER
# Insert swear words about mysql group replication and hostname length. Arghh..
NEW_NAMESPACE ?= e2e-$(shell echo ${WERCKER_GIT_COMMIT} | fold -w 8 | head -n1)
VERSION := ${WERCKER_GIT_COMMIT}
VERSION ?= ${WERCKER_GIT_COMMIT}
E2E_FUNC := e2efunc-wercker
E2E_NON_BUFFERED_LOGS ?= false
else
NEW_NAMESPACE ?= e2e-${USER}
VERSION := ${USER}-$(shell date +%Y%m%d%H%M%S)
VERSION ?= ${USER}-$(shell date +%Y%m%d%H%M%S)
E2E_FUNC := e2efunc-docker
E2E_NON_BUFFERED_LOGS ?= true
endif
Expand Down
45 changes: 0 additions & 45 deletions hack/release.sh
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions wercker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ build:
cp -R pkg ${WERCKER_OUTPUT_DIR}/
cp -R test ${WERCKER_OUTPUT_DIR}/
cp -R vendor ${WERCKER_OUTPUT_DIR}/
cp -R hack ${WERCKER_OUTPUT_DIR}/
cp -R mysql-operator ${WERCKER_OUTPUT_DIR}/
cp -R .git ${WERCKER_OUTPUT_DIR}/

Expand Down Expand Up @@ -106,7 +107,7 @@ e2e-test-upgrade:
fi
E2E_NON_BUFFERED_LOGS=true make e2e-suite-run-upgrade
make e2e-suite-teardown-upgrade

release:
box:
id: oraclelinux:7-slim
Expand All @@ -120,4 +121,4 @@ release:
token: $GITHUB_TOKEN
tag: $VERSION
title: $VERSION
draft: false
draft: false