Download as
Browse Code »

Commit 965b2b7e8b6bb0adff46e62e0e526a2b056de850

Authored by Jacob Vosmaer
1 parent 10b63aaf
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Fix name clash between release.sh / `make release`

Showing 3 changed files with 3 additions and 2 deletions   Show diff stats
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 - Add a gitlab.yml conversion support script 5 - Add a gitlab.yml conversion support script
6 - Correct default gravatar configuration (#112) (Julien Pivotto) 6 - Correct default gravatar configuration (#112) (Julien Pivotto)
7 - Update Ruby to 2.0.0p451 7 - Update Ruby to 2.0.0p451
  8 +- Fix name clash between release.sh and `make release`
8 9
9 6.8.1 10 6.8.1
10 - Use gitlab-rails 6.8.1 11 - Use gitlab-rails 6.8.1
@@ -7,7 +7,7 @@ PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("pla @@ -7,7 +7,7 @@ PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("pla
7 build: 7 build:
8 OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT} 8 OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
9 9
10 -release: no_changes on_tag purge build move_to_platform_dir sync 10 +do_release: no_changes on_tag purge build move_to_platform_dir sync
11 11
12 no_changes: 12 no_changes:
13 git diff --quiet HEAD 13 git diff --quiet HEAD
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 build="$(date '+%s')-$$" 4 build="$(date '+%s')-$$"
5 5
6 # Do the build and capture its output in a .log file 6 # Do the build and capture its output in a .log file
7 -make release 2>&1 | tee -a ${build}.log 7 +make do_release 2>&1 | tee -a ${build}.log
8 8
9 # Check the exit status of `make`, not `tee` 9 # Check the exit status of `make`, not `tee`
10 if [[ ${PIPESTATUS[0]} -eq 0 ]]; then 10 if [[ ${PIPESTATUS[0]} -eq 0 ]]; then