Commit d3794bf784af4bf65d1b124d28ad0e546d4ea9f3
1 parent
a1af7dd4
Exists in
master
and in
13 other branches
Move packages into a directory per platform
Showing
3 changed files
with
10 additions
and
1 deletions
Show diff stats
Gemfile
@@ -2,3 +2,4 @@ source 'https://rubygems.org' | @@ -2,3 +2,4 @@ source 'https://rubygems.org' | ||
2 | 2 | ||
3 | gem 'omnibus', '~> 3.0.0' | 3 | gem 'omnibus', '~> 3.0.0' |
4 | gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master' | 4 | gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master' |
5 | +gem 'ohai' |
Gemfile.lock
Makefile
@@ -2,11 +2,12 @@ PROJECT=gitlab | @@ -2,11 +2,12 @@ PROJECT=gitlab | ||
2 | RELEASE_BUCKET=downloads-packages | 2 | RELEASE_BUCKET=downloads-packages |
3 | RELEASE_BUCKET_REGION=eu-west-1 | 3 | RELEASE_BUCKET_REGION=eu-west-1 |
4 | SECRET_DIR:=$(shell openssl rand -hex 20) | 4 | SECRET_DIR:=$(shell openssl rand -hex 20) |
5 | +PLATFORM_DIR:=$(shell ohai platform | ruby -rjson -e 'puts JSON.parse(ARGF.read).first') | ||
5 | 6 | ||
6 | build: | 7 | build: |
7 | OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT} | 8 | OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT} |
8 | 9 | ||
9 | -release: no_changes on_tag purge build sync | 10 | +release: no_changes on_tag purge build move_to_platform_dir sync |
10 | 11 | ||
11 | no_changes: | 12 | no_changes: |
12 | git diff --quiet HEAD | 13 | git diff --quiet HEAD |
@@ -19,6 +20,12 @@ purge: | @@ -19,6 +20,12 @@ purge: | ||
19 | mkdir -p pkg | 20 | mkdir -p pkg |
20 | (cd pkg && find . -delete) | 21 | (cd pkg && find . -delete) |
21 | 22 | ||
23 | +# Instead of pkg/gitlab-xxx.deb, put all files in pkg/ubuntu/gitlab-xxx.deb | ||
24 | +move_to_platform_dir: | ||
25 | + mv pkg ${PLATFORM_DIR} | ||
26 | + mkdir pkg | ||
27 | + mv ${PLATFORM_DIR} pkg/ | ||
28 | + | ||
22 | sync: remove_json move_ee_to_secret_dir md5 s3_sync | 29 | sync: remove_json move_ee_to_secret_dir md5 s3_sync |
23 | 30 | ||
24 | remove_json: | 31 | remove_json: |