diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2020-01-08 16:04:14 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2020-01-08 16:04:14 +0300 |
commit | 31f3fc2737095747ea76434b425c68dec453c515 (patch) | |
tree | d2ffec55b62605390c4be32d03c2b4511ea74e3c | |
parent | 6b1e1f192c2412424c45570edddb95ff6b29172c (diff) | |
parent | 88523fd4cc43183c62bb87d93477c36e7ae7192a (diff) |
Merge branch 'remove-support-package-dir' into 'master'
Remove the _support/package directory
See merge request gitlab-org/gitaly!1732
-rw-r--r-- | _support/package/Gemfile | 5 | ||||
-rw-r--r-- | _support/package/Gemfile.lock | 48 | ||||
-rwxr-xr-x | _support/package/package | 40 |
3 files changed, 0 insertions, 93 deletions
diff --git a/_support/package/Gemfile b/_support/package/Gemfile deleted file mode 100644 index cf5bae70e..000000000 --- a/_support/package/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true -# A sample Gemfile -source 'https://rubygems.org' - -gem 'fpm' diff --git a/_support/package/Gemfile.lock b/_support/package/Gemfile.lock deleted file mode 100644 index 9eac985a8..000000000 --- a/_support/package/Gemfile.lock +++ /dev/null @@ -1,48 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - archive-tar-minitar (0.5.2) - arr-pm (0.0.10) - cabin (> 0) - backports (3.6.8) - cabin (0.9.0) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) - clamp (1.0.1) - dotenv (2.1.1) - ffi (1.9.14) - fpm (1.8.0) - archive-tar-minitar - arr-pm (~> 0.0.10) - backports (>= 2.6.2) - cabin (>= 0.6.0) - childprocess - clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.24) - ruby-xz - insist (1.0.0) - io-like (0.3.0) - json (1.8.3) - mustache (0.99.8) - pleaserun (0.0.27) - cabin (> 0) - clamp - dotenv - insist - mustache (= 0.99.8) - stud - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) - stud (0.0.22) - -PLATFORMS - ruby - -DEPENDENCIES - fpm - -BUNDLED WITH - 1.12.5 diff --git a/_support/package/package b/_support/package/package deleted file mode 100755 index 0509920ff..000000000 --- a/_support/package/package +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env ruby - -NAME = 'gitaly'.freeze -DESCRIPTION = 'Gitaly (part of GitLab). Experimental build for testing only.'.freeze -VERSION = IO.popen(%w[git describe]) { |io| io.read }.chomp.split('v', 2)[1] -ARCHITECTURE = 'amd64'.freeze -PREFIX = '/usr/local'.freeze -VENDOR = 'GitLab Inc.'.freeze -MAINTAINER = VENDOR -LICENSE = 'MIT'.freeze -URL = 'https://gitlab.com/gitlab-org/gitaly'.freeze - -PACKAGE_DIR = File.dirname(__FILE__) - -def main(args) - run!(%w[bundle install --quiet --binstubs], PACKAGE_DIR) - File.chmod(0755, *args) - File.chmod(0644, 'NOTICE') - fpm = %W[ - #{PACKAGE_DIR}/bin/fpm -t deb -m #{MAINTAINER} --vendor #{VENDOR} --license #{LICENSE} - --url #{URL} -s dir -n #{NAME} -v #{VERSION} -a #{ARCHITECTURE} --description #{DESCRIPTION} - ] - fpm += args.map { |arg| "#{arg}=#{PREFIX}/bin/" } - fpm << "NOTICE=usr/share/doc/#{NAME}/" - run!(fpm, '.') -end - -def run!(cmd, dir) - unless system(*cmd, chdir: dir) - abort "command failed: #{cmd.join(' ')}" - end -end - -abort "VERSION cannot be empty" if VERSION.empty? - -if ARGV.empty? - abort "Usage: #{$0} EXECUTABLE [EXECUTABLE...]" -end - -main(ARGV) |