From 877a7235b15b37b71d3fcb49a781a879eb1a58a8 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 23 Nov 2016 15:07:40 +0100 Subject: [PATCH 1/3] www-apps/gitlab-ce: added ebuild for gitlab-ce-8.14.0 Package-Manager: portage-2.3.0 --- www-apps/gitlab-ce/ChangeLog | 8 + www-apps/gitlab-ce/Manifest | 9 +- .../03-gitlab-ce-8.14.0-database.yml.patch | 92 ++++ www-apps/gitlab-ce/gitlab-ce-8.14.0.ebuild | 392 ++++++++++++++++++ ...rc2.ebuild => gitlab-ce-8.14.0_rc4.ebuild} | 4 +- 5 files changed, 500 insertions(+), 5 deletions(-) create mode 100644 www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch create mode 100644 www-apps/gitlab-ce/gitlab-ce-8.14.0.ebuild rename www-apps/gitlab-ce/{gitlab-ce-8.14.0_rc2.ebuild => gitlab-ce-8.14.0_rc4.ebuild} (99%) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index 9da177c..1bacb7a 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,11 @@ +*gitlab-ce-8.14.0 (23 Nov 2016) +*gitlab-ce-8.14.0_rc4 (23 Nov 2016) + + 23 Nov 2016; Manuel Friedli + +files/03-gitlab-ce-8.14.0-database.yml.patch, +gitlab-ce-8.14.0.ebuild, + +gitlab-ce-8.14.0_rc4.ebuild, -gitlab-ce-8.14.0_rc2.ebuild: + www-apps/gitlab-ce: added ebuild for gitlab-ce-8.14.0 + *gitlab-ce-8.13.6 (17 Nov 2016) 17 Nov 2016; Manuel Friedli +gitlab-ce-8.13.6.ebuild: diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 14df8c2..2a72ad0 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,6 +1,7 @@ AUX 01-gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0 AUX 02-gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0aba239d4432ddec23c083230b816cf1ed6792bfd8f6c56fa SHA512 81a543af308bcd11a93a73368aedc89604078f60c0cacf4f614ff18dc5975b2c0d030ad6565fbb134188c8f6fceb74f2767f706d6f5701092252513f5e18de11 WHIRLPOOL 81f6258f03d234c6298b7bfe2982bdfd5f86dea3405ce03d4391b484a4802f7cbe33606ce4561ca67c16a5826dec131a185fa3189c2115b4a9ec8a3b87a2ee16 AUX 03-gitlab-ce-8.12.7-database.yml.patch 2154 SHA256 6daf34a6be5038e0108169a1a23901d9f235e8d9e1e3dcc0d5113fa1b34b0698 SHA512 d43b6cf7b8c1729944482c4e8abf91ec326b38112de93caba67c37af7e9aa3b86e18d1080a92a4bac096f40c8e0c5e7d28926ed019ef052e186c3aa3ee72c9b7 WHIRLPOOL 93393c879eb120712a7ae0b50a35032752ba41ab65d20b86ff4e737fb6df8fefd4663dc171ded2bd771c1663e728d9cdc201fe4024671b9a2d5d0f01748ecd89 +AUX 03-gitlab-ce-8.14.0-database.yml.patch 2172 SHA256 8435bf632aab03057342d5d6d75f016b006da00157c0cce2661416b752f8b75d SHA512 048aa5877ef30e702727b917cf7fb6bd534c497a7c24ab55640635598af293b0567bb9f356c4b91d55291341ced50847909f117f46d3fc9962c2f7a0f7b6bfb9 WHIRLPOOL 87b62f5e326211c2ff9001742a04b71bd94b21f4851778a513f7e1981da193dc16718559be42a0ba21aaa0c2f5b65a2571bc20174c063aa13e6436f0b422f057 AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231 AUX 05-gitlab-ce-8.12.7-replace-sys-filesystem.patch 2387 SHA256 dd0e9987ed4bb3a9c73c6aee1d89434afc51ff663fef2ee4ac93adf1b73b944a SHA512 afa82fb8c8d57633c99373f31678760fa6ecca5e459a9059f5b460b458d1dbf3230108a6b4f394780c26a697881c9b2319f15804cb8d04ad3139127e7c0f4ff8 WHIRLPOOL 90ce708f8cde0a4bcaef9fc002ca00b97a1211559bcabf5481ec71c608bc5b772ecd518ff07a8d626a27e4b21c0f0f51fa37a65503e79664ececd78d5f19e87b AUX gitlab-8.10.6-sidekiq.service 1085 SHA256 de97287a5cb1d04dd4b6ac96e3569503cf797e605b325e13d4807d72cbcd7333 SHA512 9d5f3ee50f293ae0c9f353f7f9eeed00c57fd54e75a206bf7ec9b201453099222668e1d77dcfe6b35ee9a8722860551822897339c4741e0c612054a9423f132b WHIRLPOOL 5b5cb94db5c7a2c46b487821baba6fe31fa08ecc1cbae6f9b1655d32f95c57c7c8f1bede19d09a8c572512e40b0c8daf27d50ebfcbc8e4af449e21b01ad11441 @@ -20,13 +21,15 @@ DIST gitlab-ce-8.13.0.tar.gz 27763918 SHA256 0c4736ec84fe371334a0b7feca34eb6a2a3 DIST gitlab-ce-8.13.3.tar.gz 27773077 SHA256 040e43517e10782a0f11b3bfc9c349cec9e48e5c10cf8d46c7e468beb7677101 SHA512 3031798e0c56a7a028a544943304ac84e5a427e40d9db40fe75aba215192f493ee4508d6d99f0a5814ac11a52f8db673d03012cae052b3841c3407c6b9fb83a8 WHIRLPOOL 2a78824adda0aa4006facf0c791b6f0be930eb574a38dda6d58db3cd9331238f50caae4e2e6acb7442a3488b3b9c91239a488063377d6b34befc5a3375c94c7d DIST gitlab-ce-8.13.5.tar.gz 27814361 SHA256 05749840b2cf9c39cc54dd88c58571195437811b133379506523df6757c26fec SHA512 9039b46adcff7e4d9ba8029d3b97cedf672179c54c9dc48a91693ed52b2a09b8cdf3dbdfd671e58c2d91f52741bcd4220d75dc896f62cfba798f4bb64931691e WHIRLPOOL 5c6e4db776d5f021aedef7e6a6e6315c7ba01da518b0571aa00037afcad5304ea75e3d130da77644e5ca824653a507c7224207581b440437505ceb0e0d34b628 DIST gitlab-ce-8.13.6.tar.gz 27816283 SHA256 48f29ab3c33123898502563c764fbbfcc3a3146bccc6793f7129656360f277a5 SHA512 b2928b22431eb974b679b464d0a7ec85d9325b584371f884b174678943a17f8ac8db34a3e1992f0f8cbc4cbf4d3000344aa7513edc2c683fb3a8940375a5ea5f WHIRLPOOL f5c7ea34fa4b659d7c0405983b3fc797c4c7641daf027f9f3d06b6d5b3f9bb9435f200456cace9813584ad6256d6d389fbbd08b7f28a9c29aacdabb5b7dc0c2e -DIST gitlab-ce-8.14.0_rc2.tar.gz 29323411 SHA256 c97ebc9a6ea0f41968fc7fa294caebacb6013950b42b5274e68956d6d58222d3 SHA512 700b644d0556aae5292ca562a1210e273516bc0022c84d5c4fb6f1edb5538d7d3b607f7bbc89bd43d5c4402bca5703e761a1e6288943a981785a29ac55d81097 WHIRLPOOL 7406b04920db10358f80b141ecbc355e726ac8581d3bf4745e40853cdf4926400d82f4ad6233a4ba059f889af9338bc93c10a612cb3cdb9c4625f64386a612e4 +DIST gitlab-ce-8.14.0.tar.gz 29710909 SHA256 817f4d5dbb5a59d204f71954d0549f99b91746563d190f73346427a0130051e8 SHA512 4428fd6cecadd613dee705107a69bdbc87db0a80a85b431b26575c6e00ad6802d5240bb3c4a7b67b75f7dcb6926a230a845f329004ae8c60d484dd96cb79ef1f WHIRLPOOL 7aaf718229ebb99f42a4f1462cdc5da4de1f23d90e28fee20f25d93e3f8959e21c5275d4116bba16ed41450609ea1d28dcf5c150c80313a5776ed00b47bee7fc +DIST gitlab-ce-8.14.0_rc4.tar.gz 30101713 SHA256 667cccc428d20d241a19bb554eb517673e447db85d163f8245f1d9969e233a4d SHA512 4389aa9139836ec2ab70036df1f1f4324e57edc3fd13c331179e3774c2f65f253c66eaae7699ab427248ef05d2b128ddfe425b59596f1e6070e1b2278a883c37 WHIRLPOOL 1fd35f86555f45003621dda41cb1a31892dac9b02982fc04873c65ba5f7b1960b75c4b4d6ac7fe0d13b5c11e516d997504f9184449fa48ab272e696579154529 EBUILD gitlab-ce-8.12.7.ebuild 12068 SHA256 5acdce0ee5f3c6cf20a120758ad0c60ec70574d38cc2ee56037b3789d812edfd SHA512 7daf877280f4a8242fa83e1b70d5cabe99aa8bd547d0b4f9a4921c60c44228f508e39a8a4f751b987078c4d680aaff374a055c8ca5882b12f110b232c0006f4e WHIRLPOOL be51f8c53ac45db3c13f179d447665b536df4848a4c63cf5619d2620fbca7bd2701b861f636235d7e746ee7f560eb084e949288f11dceaaef826c138be321625 EBUILD gitlab-ce-8.13.0.ebuild 11859 SHA256 b90393b330f1048ea73536071793f1897d62e14773bc170600abb9ab9dc0fcc0 SHA512 31c32936dbe355dc9dae68bb5b726822a9f5222796dd11dc95b8907fbb2e316930a95568061557328a9d87b5b5eded5867a1a8d552cd9041f10054140d461426 WHIRLPOOL 2ce6cf02c5b27fe70f00795c16fa3d20f369ba820f8583c90808ac5d6c1d838425d447caaad67b76ebc64e6a3f1b6866ac2e890566dc71504056c20103b8ad97 EBUILD gitlab-ce-8.13.3.ebuild 11979 SHA256 b5a243613dbca1645c70b0b76191172d823a1775372172054c653706261dd1e7 SHA512 9121a34bb8f071395f26d0dbb87fb8bae50f00b8b606c1ced4d43d7e9908c7937fc5bd3d15992b34545206bcbf138e2ab1a593df709904b409ad9041b6a62f9a WHIRLPOOL d7c84308560a28e0222da75acad82cda660770acff43b180d40b35e6395f46adc66afb40ce3ba8c73dd76251e89f72b9dff51bc602c82154a1ea974f693104fa EBUILD gitlab-ce-8.13.5.ebuild 11979 SHA256 7b16a160712995d17004adbdfed92974f31e83bdbad745f0999e403c7db50090 SHA512 9bad09441979c9ef7bc764cddf3daf02b85b657b21b0b409dcd2257fcbae9691c3afef605ebe3f60eb11bdc61abb0ff6b22b344d41ef549dea7795576deba987 WHIRLPOOL 960d55ed74694e31dedd28307a45cfe6808fd94eb4e79c667d670f84d00a9f6bc72d702e1a59d9325087752e1a2f7ccbfcb290e573e31da0384ed3fa2ae91bae EBUILD gitlab-ce-8.13.6.ebuild 11979 SHA256 761411082e2e68f432f913f5c5c969847832d335b1f7843575890ba125542539 SHA512 ab01af577da7a27cee3308c6766a042edbce7f1c472639b9a24b9bef3a7ce37389dd8e32b43cf62b9ce7c20399ccf17fd35f678ea63598b4b06890bfeabded50 WHIRLPOOL cc14b981521f0513108ab4320f2e3d4f210ec0da7373f0f99b35d975003b5e1ff5783c5db5c6b7f29739e795fc73d4744716f81056039eefaf445354bd7cb000 -EBUILD gitlab-ce-8.14.0_rc2.ebuild 11956 SHA256 9f71c449b8ad06ac69a4de8197890aa5148db76d94d201f61b4193c586c1342d SHA512 e64507e0872f21eb0f5435f5aeb8ad34089c5973afd5d234bdeceefd185ce628a28ae4bbc652784941d303d118131b3cd040e6955cf8d5de3d97c55fce2b17ca WHIRLPOOL ab9e79520d8e405c72a60001637ae30e75d24ef29dc3cbd9f403a7b6e33e79e837f1d69a2ca5ce3b6bca80a5ee4f33704341ae7e6ec036cad565a55908caccce +EBUILD gitlab-ce-8.14.0.ebuild 12058 SHA256 ef9893f42bf74b6864d5647c406afb69412cfa88ab89fa3bbc8a69d92f6eabe9 SHA512 182be258e2ede41a056d0ecc6c8691dc89af035474b711c74887b61105e1260fd0cc02556931e713cc256766a8879356ea07ce7bb9aa8f463eedf63925afe52e WHIRLPOOL 69c12e67507d5f27bf5491d06a1f0de7e0bc156b624008977f7150b623728e255ebdcecb100aa3133dc8063f7bdfb5586c0924fa3077c1141090719666d1cb76 +EBUILD gitlab-ce-8.14.0_rc4.ebuild 11956 SHA256 d6e509c5e9de4c361f04a8c76d0e87b947c5416bc6222e716d368cd82cd55df3 SHA512 58d8862ccb1d09b05bc880fa36d6d3936d1d666537da395817e794b7410fba0df1afc136a6e2bebd6d29b2bf16ef8cd95ac3130e6f35b678c543f7e0e552810a WHIRLPOOL a348a04316fa46da98816ea6a51b641aae68b13b513cfd445b002d2a6180786cf0fd5fdfcf0420ceec8de7a090b01f4009334fe5618c47813b40f0baed8360da EBUILD gitlab-ce-9999.ebuild 11913 SHA256 9f3f58ebf1fa7fa7c6b00374e83dda8476116057ee8c6a3ecb5779f0bc7e5254 SHA512 5f2a68f540e26129d9d57a5a72ee924503bc8f8cc89539545aa0ebedf70e42e6104be879eff8cfa65fcde151dad0b4e78523210aee0f9f26549e6279dc76246e WHIRLPOOL 9810dc5e8a1f87601448fae42c8f136e2a9d1ad892357c15590bf53f26b70d3022b383da7b801a51a4ad88ec1f7033f072d294bcc884f614f695e294cfa40e2b -MISC ChangeLog 10494 SHA256 24ea4aa1ccc351068da1b0e640ecab7074c6e5a6a4c58364790f1555e316800e SHA512 a9a6d921379ced162b4ac5df044d9d5ef7a84e3b76fd2f68b0f4427b5152f2da1d70d70c4b6d558e238206bf4d9ca8cad408a68b3df7f90ce73af2661198f136 WHIRLPOOL 8af4c27256e738d23d9376aa125810cb4aa8ba6ccafd5e43a999ee88ccbf10a795ebabe60a6fa99dbf51e1fbb75ae9e8c0256c7e601730f8ad8127f629ad3bfd +MISC ChangeLog 10809 SHA256 eb1ab94ebfc08bd663293f67bf4b068943f9d30ac2503d500d96d612e2806dfd SHA512 5ec91df02f77d70fe20dc57c9e900de1cf17f9c35e62b71d70f08ff0eb4b4aaa4c10dcd55db5b80ee327edae70000e45bccb2e50c4c9e7240732cbbeaec5cc5c WHIRLPOOL 8b6fb0b9b9f30c1ebd0c03a6fe7ef9f8010e2975d6132baf85b8ef44d51120b6a3021ebf2af8a1ed24165c6f426732c7d8e55f5d8c69167614e2e2242484b3c0 MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3 diff --git a/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch b/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch new file mode 100644 index 0000000..023641e --- /dev/null +++ b/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch @@ -0,0 +1,92 @@ +diff --git a/config/database.yml.mysql b/config/database.yml.mysql +index d970287..a3b5ecc 100644 +--- a/config/database.yml.mysql ++++ b/config/database.yml.mysql +@@ -6,37 +6,9 @@ production: + encoding: utf8mb4 + collation: utf8mb4_general_ci + reconnect: false +- database: gitlabhq_production ++ database: gitlab + pool: 10 + username: git + password: "secure password" + # host: localhost +- # socket: /tmp/mysql.sock +- +-# +-# Development specific +-# +-development: +- adapter: mysql2 +- encoding: utf8mb4 +- collation: utf8mb4_general_ci +- reconnect: false +- database: gitlabhq_development +- pool: 5 +- username: root +- password: "secure password" +- # socket: /tmp/mysql.sock +- +-# Warning: The database defined as "test" will be erased and +-# re-generated from your development database when you run "rake". +-# Do not set this db to the same as development or production. +-test: &test +- adapter: mysql2 +- encoding: utf8mb4 +- collation: utf8mb4_general_ci +- reconnect: false +- database: gitlabhq_test +- pool: 5 +- username: root +- password: +- # socket: /tmp/mysql.sock ++ # socket: /run/mysqld/mysqld.sock +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 7067e0f..74af7df 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -4,42 +4,9 @@ + production: + adapter: postgresql + encoding: unicode +- database: gitlabhq_production ++ database: gitlab + pool: 10 + # username: git + # password: + # host: localhost + # port: 5432 +- +-# +-# Development specific +-# +-development: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_development +- pool: 5 +- username: postgres +- password: +- +-# +-# Staging specific +-# +-staging: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_staging +- pool: 5 +- username: postgres +- password: +- +-# Warning: The database defined as "test" will be erased and +-# re-generated from your development database when you run "rake". +-# Do not set this db to the same as development or production. +-test: &test +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_test +- pool: 5 +- username: postgres +- password: diff --git a/www-apps/gitlab-ce/gitlab-ce-8.14.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.14.0.ebuild new file mode 100644 index 0000000..6e845ba --- /dev/null +++ b/www-apps/gitlab-ce/gitlab-ce-8.14.0.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Maintainer notes: +# - This ebuild uses Bundler to download and install all gems in deployment mode +# (i.e. into isolated directory inside application). That's not Gentoo way how +# it should be done, but GitLab has too many dependencies that it will be too +# difficult to maintain them via ebuilds. +# + +USE_RUBY="ruby21 ruby23" + +inherit eutils ruby-ng user systemd + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="cde955c9645ddfaae2f154d3d3aded79c9fc574f" + +DESCRIPTION="GitLab is a free project and repository management application" +HOMEPAGE="https://about.gitlab.com/" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" +RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" + +RESTRICT="mirror" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm ~arm64" +IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" + +## Gems dependencies: +# charlock_holmes dev-libs/icu +# grape, capybara dev-libs/libxml2, dev-libs/libxslt +# rugged dev-util/cmake, virtual/pkgconfig +# json dev-util/ragel +# pygments.rb python 2.7+ +# execjs net-libs/nodejs, or any other JS runtime +# pg dev-db/postgresql +# mysql virtual/mysql +# +GEMS_DEPEND=" + dev-libs/icu + dev-libs/libxml2 + dev-libs/libxslt + dev-util/ragel + net-libs/nodejs + postgres? ( >=dev-db/postgresql-9.1:* ) + mysql? ( virtual/mysql ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake + virtual/pkgconfig" +COMMON_DEPEND=" + ${GEMS_DEPEND} + ~dev-vcs/gitlab-shell-4.0.0 + >=dev-vcs/git-2.7.4 + ~dev-vcs/gitlab-workhorse-1.0.0 + kerberos? ( !app-crypt/heimdal ) + rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" +DEPEND=" + ${CDEPEND} + ${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + >=dev-db/redis-2.8 + virtual/mta + systemd? ( sys-apps/systemd:0= )" +# dev-ruby/bundler should be >=1.13.6, but that doesn't exist yet in the tree. +ruby_add_bdepend " + virtual/rubygems + >=dev-ruby/bundler-1.0" + +# +# fix-sendmail-config: +# Fix default settings to work with ssmtp that doesn't know '-t' argument. +# fix-redis-config-path: +# Point to the absolute location of redis_config.rb +# +RUBY_PATCHES=( + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" + "03-${PN}-8.14.0-database.yml.patch" + "04-${PN}-8.12.7-fix-check-task.patch" + "05-${PN}-8.12.7-replace-sys-filesystem.patch" +) + +MY_NAME="gitlab" +MY_USER="git" # should be same as in gitlab-shell + +DEST_DIR="/opt/${MY_NAME}" +CONF_DIR="/etc/${MY_NAME}" +LOGS_DIR="/var/log/${MY_NAME}" +TEMP_DIR="/var/tmp/${MY_NAME}" + +all_ruby_prepare() { + # fix paths + local satellites_path="${TEMP_DIR}/repo_satellites" + local repos_path=/var/lib/git/repositories + local shell_path=/usr/share/gitlab-shell + sed -i -E \ + -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ + config/gitlab.yml.example || die "failed to filter gitlab.yml.example" + + local run_path=/run/${MY_NAME} + sed -i -E \ + -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ + -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ + -e "s|/home/git/gitlab|${DEST_DIR}|" \ + config/unicorn.rb.example || die "failed to filter unicorn.rb.example" + + sed -i \ + -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ + lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" + + # modify default database settings for PostgreSQL + sed -i -E \ + -e 's|(username:).*|\1 gitlab|' \ + -e 's|(password:).*|\1 gitlab|' \ + -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ + config/database.yml.postgresql \ + || die "failed to filter database.yml.postgresql" + + # rename config files + mv config/gitlab.yml.example config/gitlab.yml + mv config/unicorn.rb.example config/unicorn.rb + + local dbconf=config/database.yml + if use postgres && ! use mysql; then + mv ${dbconf}.postgresql ${dbconf} + rm ${dbconf}.mysql + elif use mysql && ! use postgres; then + mv ${dbconf}.mysql ${dbconf} + rm ${dbconf}.postgresql + fi + + # remove useless files + rm -r lib/support/{deploy,init.d} + use unicorn || rm config/unicorn.rb +} + +all_ruby_install() { + local dest=${DEST_DIR} + local conf=${CONF_DIR} + local logs=${LOGS_DIR} + local temp=${TEMP_DIR} + + # prepare directories + diropts -m750 + dodir ${logs} ${temp} + + diropts -m755 + dodir ${conf} ${dest}/public/uploads + + dosym ${temp} ${dest}/tmp + dosym ${logs} ${dest}/log + + # install configs + insinto ${conf} + doins -r config/* + dosym ${conf} ${dest}/config + + echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" + + # remove needless dirs + rm -Rf config tmp log + + # install the rest files + # using cp 'cause doins is slow + cp -Rl * "${D}/${dest}"/ + + # install logrotate config + dodir /etc/logrotate.d + cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF + ${logs}/*.log { + missingok + delaycompress + compress + copytruncate + } + EOF + + ## Install gems via bundler ## + + cd "${D}/${dest}" + + local without="development test aws" + local flag; for flag in mysql postgres unicorn kerberos; do + without+="$(use $flag || echo ' '$flag)" + done + local bundle_args="--deployment ${without:+--without ${without}}" + + use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" + + einfo "Running bundle install ${bundle_args} ..." + ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" + + einfo "Cleaning old gems ..." + ${RUBY} /usr/bin/bundle clean + + # clean gems cache + rm -Rf vendor/bundle/ruby/*/cache + rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git + + ## RC script ## + + if use systemd ; then + ewarn "Beware: systemd support has not been tested, use at your own risk!" + systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" + systemd_dounit "${FILESDIR}/gitlab-unicorn.service" + systemd_dounit "${FILESDIR}/gitlab-workhorse.service" + systemd_dounit "${FILESDIR}/gitlab-mailroom.service" + systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" + else + local rcscript=gitlab-8.13.3-sidekiq.init + use unicorn && rcscript=gitlab-8.13.3-unicorn.init + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|" \ + -e "s|@GITLAB_BASE@|${dest}|" \ + -e "s|@LOGS_DIR@|${logs}|" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${MY_NAME}" + fi + + # fix permissions + fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} +} + +pkg_postinst() { + elog "If this is an update from a previous version, stop your GitLab" + elog "instance and issue the following command to perform all required" + elog "migrations:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" + elog "before running the config phase. Run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" + elog + elog "If this was a fresh install, follow these steps:" + elog + elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." + elog + elog "2. Configure your database settings in ${CONF_DIR}/database.yml" + elog " for \"production\" environment." + elog + elog "3. Then you should create a database for your GitLab instance, if you" + elog " haven't done so already." + elog + if use postgres; then + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog " Note: You should change your password to something more random..." + elog + fi + elog "4. Finally execute the following command to initialize the environment:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog " Note: Do not forget to start Redis server first!" + elog + elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" + elog "you can't login after the upgrade, be sure to read the section about the" + elog "verification of the CSRF token in GitLab's trouble-shooting guide at" + elog "http://goo.gl/5XGRGv." + if use postgres; then + elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" + elog "`pg_trgm` extension by running the following command as a PostgreSQL" + elog "super user for *every* GitLab database:" + elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" + elog "For details, see the documentation at the GitLab website." + fi +} + +pkg_config() { + einfo "Checking configuration files" + + if [ ! -r "${CONF_DIR}/database.yml" ]; then + eerror "Copy ${CONF_DIR}/database.yml.* to" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "database settings for \"production\" environment."; die + fi + + local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" + local git_home="$(egethome ${MY_USER})" + + # configure Git global settings + if [ ! -e "${git_home}/.gitconfig" ]; then + einfo "Setting git user" + su -l ${MY_USER} -c " + git config --global user.email '${email_from}'; + git config --global user.name 'GitLab'" \ + || die "failed to setup git name and email" + fi + + su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" + + # determine whether this is an update or a fresh install. we do this by + # checking whether the ${DEST_DIR}/.git directory exists or not + # + if [ -d "${DEST_DIR}/.git" ]; then + local update=true + else + local update=false + fi + + ## Initialize app ## + + local RAILS_ENV="production" + local RUBY=${RUBY:-/usr/bin/ruby} + local BUNDLE="${RUBY} /usr/bin/bundle" + + # FIXME: this line existed in older ebuilds, but the variable is + # never used. what was it for!? + # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" + + if [ "${update}" = 'true' ]; then + einfo "Migrating database ..." + exec_rake db:migrate + + # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 + einfo "Migrating iids ..." + exec_rake migrate_iids + + einfo "Cleaning old precompiled assets ..." + exec_rake assets:clean + + einfo "Cleaning cache ..." + exec_rake cache:clear + else + # create dummy git repo as workaround for + # https://github.com/bundler/bundler/issues/2039 + einfo "Initializing dummy git repository to avoid false errors from bundler" + su -l ${MY_USER} -c " + cd ${DEST_DIR} + git init + git add README.md + git commit -m 'Dummy repository'" >/dev/null + + einfo "Initializing database ..." + exec_rake gitlab:setup + fi + + einfo "Precompiling assests ..." + exec_rake assets:precompile + + if [ "${update}" = 'true' ]; then + ewarn + ewarn "This configuration script runs only common migration tasks." + ewarn "Please read guides on" + ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" + ewarn "for any additional migration tasks specific to your previous GitLab" + ewarn "version." + fi + elog + elog "If you want to make sure that the install/upgrade was successful, start" + elog "Gitlab now and then run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" + elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" + elog + if ! use systemd ; then + elog "You may also run" + elog " /etc/init.d/gitlab check" + elog " for convenience." + fi +} + +ryaml() { + ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" +} + +exec_rake() { + local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 + cd ${DEST_DIR} + ${command}" \ + || die "failed to run rake $@" +} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc2.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc4.ebuild similarity index 99% rename from www-apps/gitlab-ce/gitlab-ce-8.14.0_rc2.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.14.0_rc4.ebuild index 6f20774..129071e 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc2.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc4.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="4c97f6fa3f0201abb4635c64b4263d85c7deeb6e" +MY_GIT_COMMIT="0262cd5cbf60f197dcecffebeaeb1771d0093906" DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" @@ -80,7 +80,7 @@ ruby_add_bdepend " RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" "02-${PN}-8.11.0-fix-redis-config-path.patch" - "03-${PN}-8.12.7-database.yml.patch" + "03-${PN}-8.14.0-database.yml.patch" "04-${PN}-8.12.7-fix-check-task.patch" "05-${PN}-8.12.7-replace-sys-filesystem.patch" ) From a6d0f4683d4ebdd706e733d55fc87c78bcd91270 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 23 Nov 2016 17:02:09 +0100 Subject: [PATCH 2/3] dev-vcs/gitlab-ci-multi-runner-bin: added ebuild for gitlab-ci-multi-runner-1.8.0 and pruned old ones Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog | 9 ++ dev-vcs/gitlab-ci-multi-runner-bin/Manifest | 14 +-- .../gitlab-ci-multi-runner-bin-1.5.0.ebuild | 103 ------------------ ...> gitlab-ci-multi-runner-bin-1.8.0.ebuild} | 2 +- 4 files changed, 15 insertions(+), 113 deletions(-) delete mode 100644 dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild rename dev-vcs/gitlab-ci-multi-runner-bin/{gitlab-ci-multi-runner-bin-1.4.1.ebuild => gitlab-ci-multi-runner-bin-1.8.0.ebuild} (98%) diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog b/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog index dc00eab..efff934 100644 --- a/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog @@ -1,3 +1,12 @@ +*gitlab-ci-multi-runner-bin-1.8.0 (23 Nov 2016) + + 23 Nov 2016; Manuel Friedli + +gitlab-ci-multi-runner-bin-1.8.0.ebuild, + -gitlab-ci-multi-runner-bin-1.4.1.ebuild, + -gitlab-ci-multi-runner-bin-1.5.0.ebuild: + dev-vcs/gitlab-ci-multi-runner-bin: added ebuild for gitlab-ci-multi- + runner-1.8.0 and pruned old ones + 24 Oct 2016; Manuel Friedli gitlab-ci-multi-runner-bin-1.4.1.ebuild, gitlab-ci-multi-runner-bin-1.5.0.ebuild, diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/Manifest b/dev-vcs/gitlab-ci-multi-runner-bin/Manifest index 74aee89..2d050a3 100644 --- a/dev-vcs/gitlab-ci-multi-runner-bin/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner-bin/Manifest @@ -1,20 +1,16 @@ AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a AUX gitlab-ci-multi-runner.init 702 SHA256 7a19a20f0b3138a86d805872706ebc2918b01663cfdb351aa2d2cb89707602e9 SHA512 005e10a1c2974209f74efb5899d8f7627284947b716049a5211a2c5767a43b7a629061d96a6f445646f88cdb4afb9918fc2d154d68fabd4fe8ec4e0b9fd0125f WHIRLPOOL 85100f9a311ce1a39adddc10dee5af7862dceff5ae24e30c2830b74cdf78d74357fc0f0b43010a79909caf31e33439f0facc5dbd8e87b6452180093d1058eb3d -DIST gitlab-ci-multi-runner-bin-1.4.1-amd64 59770288 SHA256 b6c732e737fab160199cc91ba443c496720b3274e48600adf2a8f3814af9d8ac SHA512 0533bd8382d31d048cee4c37bff1277f30641be021f9c8a0d2d7c40a53839ee08589b77cb40d21a26facd016dbd1816b8a8ff1524f196bebff7851c378384615 WHIRLPOOL 32dae2b897c8656151c82d37141be5cca2f6080ae0de21a10914652d9919900b4fad274d3cdb1c0b075f3634cc24aa51b466420a497c5405c978fa4062c8f0e8 -DIST gitlab-ci-multi-runner-bin-1.4.1-arm 56437360 SHA256 301f4a166b76b44361e566c7806c1b9cf63e4e62e3b621e5c31b0bcc707f674a SHA512 efc062285f862e8b1c4a39454f9f15ca722ed58d82aabbc5f72d8d8c5328adef8eddc98ff8cb2dbb616561b825b619dfc52cc69dfc358fbc6d2f4934f9c9fcfe WHIRLPOOL 682fad03439d1a6570b0bccf694adc577a653917ba0fa0315fbb717d27127995bbb2950eace663cd96ca64234c5ac51ec652f59ebe657ad0183d7b4a74c30f85 -DIST gitlab-ci-multi-runner-bin-1.4.1-x86 56606472 SHA256 6606bf3177a2355916833bd2656fc9d0e46dd0e5b7b149105bd283e2a4a67baf SHA512 8266b110088c2559632ab6f26cf54e19a0458de1f858fe3e986bc9c78fbe592fb1492aa4d5187c934a8b2c1bcac15cf10cd7de1207c76a8d6a5302cb4e2cda92 WHIRLPOOL 1c1dd94a8b2efbf39284a51bc60efc1eb58a17bdc927658153ee505cfb6a9ed0dc2160791cacc72e10beb2155b813e71ebbb82abe54c1dd5566200ef02082e2f -DIST gitlab-ci-multi-runner-bin-1.5.0-amd64 40162568 SHA256 8068a7c0a149cda3782ea58b29ac1f1dfb7018d2021359b2be6094493a86fbf0 SHA512 e06c2aa44d7c369bfa6315221bac19670c97268f64660a320fa9872f86991c1f3c3ef25a9cd233b5769bbf30e1a4958d347f7bbb991dbf10696666332d763314 WHIRLPOOL 4b9e5e06671955245116693d73e5158c0e6a9455127cf6703222a353467c3c57128df0ad682dc47db37b20f98e2a870b5e32344c69c64f301a4611c451305569 -DIST gitlab-ci-multi-runner-bin-1.5.0-arm 36718736 SHA256 38849b5948d892b505f2d8b01b777ed4b22eea2a6ce91aeaf276c3ad6fcb56cd SHA512 14439be83d1f5cb3a2e2b67421138ef4b6ea2ed6636214f082f4db32786a6707c4299c23410ba6c54e06079358acdf84e3a0ee9c5280c17f06576463607187c4 WHIRLPOOL ca677e0d62323021ec477fa031cc1a8cab76757101abe7033c0c1da632f99d225c622792d07df93b935467a7ed987e2cbe6c4dd00e16f06ad3988d4bd21623d2 -DIST gitlab-ci-multi-runner-bin-1.5.0-x86 36892864 SHA256 029e1a570ff5f5f570d107cb451b2a759829ba64fde6965a1d4abc6135ef63be SHA512 06d55f40e3d43ef3524266fec1c009372bb18850394ec5688979fe6bf33e3bf864aa0582ff0de5eb1e088ce2a24b09bdb6a2772643a15f4d8e994c7f194197a9 WHIRLPOOL 8ede1609492f33599078129a44c28eb58f850da715d091b847a753589a68cfac9f206f9c5e7b78eddad67a834279fbd4cd72a7fb5ea09075aa16729f70edeff2 DIST gitlab-ci-multi-runner-bin-1.6.0-amd64 81450584 SHA256 09dbfd1770253e4216de45e3de359707b9e48d1cd406fe7a7108f0d46880f9c8 SHA512 03c0f1a364509fceaea7c3250885f1d65349cc7b3b9febcb2b67f300b371fcf307f2e44f8c7da57776c05c57c350685459b0167f9dfe1d239d3c472d674dc35e WHIRLPOOL 80dd59f5343efd4a3f0278e66bb1ec7f9b64ed6c16580a9ea9c0554469bf668a7a1553c70e79ffe25e18fe6bea61d219112509ef30c38dc8cb56c4fccc4e37a4 DIST gitlab-ci-multi-runner-bin-1.6.0-arm 71394024 SHA256 ce42d293752d2781f1d657da6489ebf6f8df610df72742f144004fd12bf88cac SHA512 d23a95d367a9b68fc456fe67a7f243a824f0d1ddb5015740ede83297d328d31e34203ba4d49bac87a81bdefde1ae9aca401016777aaae33c9a4965441ae05381 WHIRLPOOL 8c0a70aab601d785400d1f0993581f41243ac4c01618cd8ff5dc60229cf2184a76adf7e9a1cc1b6ed99392a1aeb17177909dc78d877f71a4126a0990e57b6b8f DIST gitlab-ci-multi-runner-bin-1.6.0-x86 72066176 SHA256 ab59163f79e327a1bf6a6d1469762d1f113484b561c6c4dcc07fda127068d9f4 SHA512 ce9eb72e86bd9a2ccd40be585b8f4645d7eb471a4b35a79b4c91dedb95611162c60f2a5e098774ac0879d1dd97f98431372e47e9c5152971d11591a502b0e96f WHIRLPOOL b05f559e04756f2f7cd05a833dbdabf008a98cf1314a81021c76d1c9c2afd4df7d1d5f4c2a585ef97f72dfeef84f2c01e8a6cabba8b018e1ab99ae7ff106b3f4 DIST gitlab-ci-multi-runner-bin-1.7.0-amd64 68204551 SHA256 367ed93a9b37026bf1679d43e1d150c7edda151e5c5807e43a0b85706a368de6 SHA512 f516046b29b16ba51e9124aa6e2d97bf549628567cafe3e72c49160945f39ac954a31e7460460b06119b8baa59e3724c515aa6635f8cc7e845cfc4e647ca66bf WHIRLPOOL 25f41cbeff6d441bfd11d6cc2b335d594f67c2f995268fd2a65f2da021792abcb9877adcf8f27d33194ad8dcbcc26d96b3b86d193e448143d717ac6b9dd973c6 DIST gitlab-ci-multi-runner-bin-1.7.0-arm 64871891 SHA256 b30873ec3fbc1510fdd92e64afb1cd5bc11db295eb5da7d4d4931211a40d4d8d SHA512 0988ef4bbae45e114eed98a6bc47284df26b4d283aeda5ae6be17a79d7bc416e060234e30592c8d44804ee56cbdd45be33777edd4cde4f8a4cc101516aff613c WHIRLPOOL 77fd1538e7e7a1513e2b31ccc9998fb5aea95c974808ca4f56a3e60bcb37f216a37b1ca0ead5d826ccb8712a0554baee300d5fe845bf9fcdd6094be6a0e177ee DIST gitlab-ci-multi-runner-bin-1.7.0-x86 64635954 SHA256 4028364f26e9169f04e37beb404aebfaa5f0ad2560e6dccda302f9acd73e47a5 SHA512 56fea1b4b5de617b998c998edeb914eb0500de597fead2c37bd81526b48822c84a49c8263567c2f3ece3d2bab50287162b66fbeec5c0f9e1e2159c115a6c14ed WHIRLPOOL 3238e95cbd742b7057c224fb8d0a7511f7dcb0d1c0b07e446d2f0a4f6c7f4e6646e9b1c54cb14cd29c479efbaf113e5e501da54538983307ab8c3f350a36dac3 -EBUILD gitlab-ci-multi-runner-bin-1.4.1.ebuild 2411 SHA256 03e319b28ffb6553cc5aa4ad867197741426f84912453675adecd8a008969f8c SHA512 f3ba80bea5be8de83cde8ad4d892162f55b20f8e7ab28148b0e6c6fd20d7054e06b256196e52d409cf749fd65b1beaf1f56c1dba541ba5b63b7198bad5ee24d2 WHIRLPOOL 02273bd4cbf5a5f15ede2968390f621752940f0af3d398f39bfd20fa3d004fc3c770a12a841440ee3cd70254c510fd7f17e57171b05913555f79a8a7776dc158 -EBUILD gitlab-ci-multi-runner-bin-1.5.0.ebuild 2411 SHA256 fed2bdcf3a3e22c251e209fe70db415d863b19503a9aae1d83140cee1c7430f6 SHA512 9885ceb82acbf2c3354d42251f83555bee0278b698e064096d462ff8fc469b2afe675c6b1a59b9c3a0d724e087f5c071f466bafb40437ea8783a239b68b5d624 WHIRLPOOL dd31877c8e4e0e5bcb94d1b41d1342f531aad8e2f2fa3fbb25139d5e1f4a406bd212da97d30e8c90645d46a3ddecb07446c527b4ce4e46f1e670f13107fb1640 +DIST gitlab-ci-multi-runner-bin-1.8.0-amd64 69057552 SHA256 851e5b438d0b04a633623437794c8bb019bb163cba067cf2f60801948937d6c7 SHA512 60fb2440f5e256f4a7d3ab6d3c5731f33328782ba73957107bd122372b59d2c6e1e7511ca8f6c149985bb1d43cf02803c60022ffbb74d5d173033caebe3103a0 WHIRLPOOL 93c007f122bfcbe8c4f8385a5af79b3a2d028136e6c2187f6b7461ece4aef4c60bbee4ef4121bc8b692195674727719543c081875bd1b00f51a2898d464409d9 +DIST gitlab-ci-multi-runner-bin-1.8.0-arm 65672013 SHA256 a9047148ea205225a88a1026f51dfb565bed69cfafd3123beaa1955b169bd193 SHA512 2156bda5fe3818f024059bfd2d735c20398f6c386198ec0edb6ee83ee0439c3e03cdfbd9bf6bb19b446d2dbc28f553f404be3d3df1703b5f95c2f3d000fd16e8 WHIRLPOOL 0a831afefe3453b75f97248ebab197f633a97232abc8699b5120afd0aca327ef3733b8709feb0fb5108cafb7cc4b9c16649c38a0ca90978d099343ae077a5289 +DIST gitlab-ci-multi-runner-bin-1.8.0-x86 65431904 SHA256 88644de0441f33d410928b1aecb0db04dd77ad0870406caec98d3034cbe4cd3f SHA512 f3e6fca39a6146adcf1be72628d47370394dd62097e5b917ee4b8715248b057b20906d032efbf7988127dee5d75b4a0887750e3755a5123e35fabb520297ef13 WHIRLPOOL 2eb8c072263f182912d342b8cacd99aca3e9fe048d05d25275a3fd396603c89a7ce4a7edf97a2552fe2bae2c08647444d4702bbda1296878e3f062338e96500c EBUILD gitlab-ci-multi-runner-bin-1.6.0.ebuild 2411 SHA256 df591d547119124d7dbb65f02677f2adce9c00f16dcb68c30fbc1c11aadfd82a SHA512 2d48cf26aa255af15c75e055349f38a96de061e4f3e5185e614f1479b4964938e1b9ee491037e1d5f33e2ce900fc9967cc2ce76ec9dd3f0b89b8eb3ee1c012c2 WHIRLPOOL a0e1505951280c1238ff6649bbfb7ebe2e14930057180fe9387354017c44e16b47eb83cb5173a80d13619cf981a5da3c263d9008b9444ba04cd691e5f2ca99d9 EBUILD gitlab-ci-multi-runner-bin-1.7.0.ebuild 2411 SHA256 cc4d039a20156f466d2b5e8fa332dc623bd948c86601ece073c3700ed12fa6a2 SHA512 4e5740ce6512894a36187f4dc76833daeec18288ad079b5bf434a2bef65ad806e8cb21a00a09d9f7714eb029f726036105c0d12b77ddc8a7f7833c6fc7d1aa40 WHIRLPOOL 855db2c82a377297c81beb10bc4a3c0196cd0ee0ba8cc89d0a9aca9785109af0864afeb18aa5a9ce71e34093235015b7a45d9eaf8f95a21de71a6bade9955ec8 -MISC ChangeLog 2654 SHA256 2131478526b2405d90dce83b6cd5d58f99443e428fb3e648de5284f08df8afd3 SHA512 00025f63e1b7b95249044c6efdc7653fc7b7e45b68da91dcf8a19a8de3d04a3d9672a3afe51fa29e618914765f18cb011964652b8815a968e92a791d3d602265 WHIRLPOOL 0f27eeacce4d0d3637a18fa07dd1958ce0a76a4a4a848f324373fc90e56f13824e8afe0ba5e59aa91e5bdba334af469a13f9b5247fcafbc8db301bfa26a29ffe +EBUILD gitlab-ci-multi-runner-bin-1.8.0.ebuild 2411 SHA256 b40c9371273c2be43a7b1d93d125791afaf6c9cce21bf24fa926f95b73842d2f SHA512 117b6c5ea58d546356bc334e7eca3fbdd65954cb61573e6422753742083ea3e949513fbe161ed2e5c0dd73e94876a4bf7977b00dd7d9a87efc4988a83f3b7efb WHIRLPOOL 4b5196976691b1b5feedaef59be60f0e246bdfd237cce269d5ac1f2879bc82341ee3761a512f403fd19737143dd884d4985955e023b8df87bad0f31fe861d1d1 +MISC ChangeLog 2995 SHA256 28132dae936efd153b5923e389f7cc3a9b3397bb84a09db4a7ee67f4550653f6 SHA512 cfcd1448295615bfca384461c3601c2de5308c12ff1ba544821af5f878d2e58da4b7c5ab73da448af8ea5e9b6f08a8b7d71e9db329ebfbe2744b1ed01be2051d WHIRLPOOL 7b932135c6c51547b3423bec14b40900c033e37f302c184817fb93223cacde74737d08ce1d6450ffa8f07c2a378b4e4e80fecdd9e218142a764ad80b2011a1c7 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild deleted file mode 100644 index 8b94bfd..0000000 --- a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils user - -MY_PN="gitlab-ci-multi-runner" - -DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.11" -HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}" -SRC_URI="x86? ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-arm -> ${P}-arm )" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" - -DEPEND="dev-vcs/git - !dev-vcs/gitlab-ci-multi-runner" -RDEPEND="${DEPEND} - net-libs/nodejs - virtual/mta" - -MY_USER="gitlab_ci_multi_runner" - -DEST_DIR="/opt/${MY_PN}" -LOGS_DIR="/var/log/${MY_PN}" -TEMP_DIR="/var/tmp/${MY_PN}" -RUN_DIR="/run/${MY_PN}" - -pkg_setup() { - enewgroup ${MY_USER} - enewuser ${MY_USER} -1 /bin/bash ${DEST_DIR} ${MY_USER} -} - -src_unpack() { - local a="$(usev amd64)$(usev arm)$(usev x86)" - mkdir -p "${S}" - cp "${DISTDIR}/${P}-${a}" "${S}/${MY_PN}" -} - -src_prepare() { - chmod +x "${S}/${MY_PN}" - eapply_user -} - -src_compile() { - # nothing to compile, binary all-in-one goodness! (?) - : -} - -src_install() { - local dest=${DEST_DIR} - local conf="/etc/gitlab-runner" - - diropts -m755 - dodir ${dest} - - exeinto ${dest} - doexe "${S}/${MY_PN}" - - diropts -m750 - dodir ${conf} - - dosym ${conf} ${dest}/.gitlab-runner - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${conf} - - ## RC script ## - - local rcscript="${MY_PN}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_PN}" - newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}" -} - -pkg_postinst() { - elog - elog "If this is a fresh install of GitLab CI Multi Runner, please configure it" - elog "with the following command:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" -} - -pkg_config() { - einfo "You need to register the runner with your GitLab CI instance. Please" - einfo "Follow the instructions at" - einfo - einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md" - einfo - einfo "Perhaps I'll improve the ebuild later ... kthxbye." -} diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.8.0.ebuild similarity index 98% rename from dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild rename to dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.8.0.ebuild index 1016035..93e9591 100644 --- a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild +++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.8.0.ebuild @@ -8,7 +8,7 @@ inherit eutils user MY_PN="gitlab-ci-multi-runner" -DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.10" +DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.14" HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}" SRC_URI="x86? ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 ) amd64? ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 ) From a6774707bc4e589686ec675669942ace5884d8a0 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 23 Nov 2016 17:35:25 +0100 Subject: [PATCH 3/3] dev-vcs/gitlab-ci-multi-runner: added ebuild for gitlab-ci-multi-runner-1.8.0 Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-ci-multi-runner/ChangeLog | 6 + dev-vcs/gitlab-ci-multi-runner/Manifest | 7 +- .../files/0001-fix-Makefile-1.8.0.patch | 70 +++++++++++ .../gitlab-ci-multi-runner-1.8.0.ebuild | 117 ++++++++++++++++++ 4 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch create mode 100644 dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog index 7ba8ed6..2e930a9 100644 --- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog @@ -1,3 +1,9 @@ +*gitlab-ci-multi-runner-1.8.0 (23 Nov 2016) + + 23 Nov 2016; Manuel Friedli + +files/0001-fix-Makefile-1.8.0.patch, +gitlab-ci-multi-runner-1.8.0.ebuild: + dev-vcs/gitlab-ci-multi-runner: added ebuild for gitlab-ci-multi-runner-1.8.0 + 25 Oct 2016; Manuel Friedli files/gitlab-ci-multi-runner.init, gitlab-ci-multi-runner-1.7.0.ebuild: dev-vcs/gitlab-ci-multi-runner: install init script, set up required diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest index 37ffcca..f0098a9 100644 --- a/dev-vcs/gitlab-ci-multi-runner/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner/Manifest @@ -1,9 +1,14 @@ +AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b AUX 0001-fix-Makefile.patch 3401 SHA256 d764379ad6b027eaab6e6f8a3874befad9567e5114caa247843d9abad29bf10e SHA512 12a44684aa05df41dea29e66bf42ec6a6b40f06b1a9c8a2682c5ce7a62264b1135df3a69f98cd9bf10bc05da062c61cfa02f803226d022ed9ebaf0bf6469449b WHIRLPOOL cdab4d9382f522ef136e77eeb38c7532172bc538e95254c4e57dfdf9b277d10f469211350994a228529142dc07d04f1df89a81acac01665ca2c9c9961f7da65a AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f DIST gitlab-ci-multi-runner-1.7.0-prebuilt-arm.tar.xz 9331496 SHA256 11431f2db5809829fe652c337b05cad9ccba837491c44c6fa0bb3ae0c9be6f49 SHA512 61b3fe3559b18f55be1148ab77232d6b505949ec965622fefa92fff07ffcee74ee2516c065ae4af3074f407c4ee77ba45d3cf4dc37f893c2e6322a911ffaef0b WHIRLPOOL 4d4a7696bf7ff462442f7dcbff4c7e0d49160b87dbfefe7d5c1a60184eba021a83ebfc54859dcc8beedc6e10fbab88bdfb374be06ab7791e2b374a52d05c3563 DIST gitlab-ci-multi-runner-1.7.0-prebuilt-x86_64.tar.xz 8370352 SHA256 e50ba210ccdde7635d1d8621de1f8bad2c4765495d4ce0f6385e776e569d80e1 SHA512 c62060a6f8314f308e12840506ec074c685b9962235ead8a2454b7e628060028274374b11d5da94ebda3ff802e6d3c377dc3e1e9d190d4ea0638722a98661c7c WHIRLPOOL 39727f719fd4394793601b6c521fa97a7c7333ba52aa0efb83348c5c366f180d8e60236349efa0400b346bfa8d1e75770f8c08b124d6107981c2967cca730882 DIST gitlab-ci-multi-runner-1.7.0.tar.gz 3527772 SHA256 ffcc18bfc54d4e2846bbfb21e72798c90ca5af214ac606ea07fbbeec24bb155f SHA512 06289c910f599ce180d62bad2e36cf4ac0f261f740c7ae3d4baf42aa4926b9dd2229b8c25ce8191613957017e1b1af4cdde76512eff2460f4a3db7f085a0e2a1 WHIRLPOOL 17d1259123bd0e8275f72453ba89e59f557e568b6698a0f61a511217b22a28d60350925928275072b1599cf4cf841d3f720eebd7a4e409627ad9257e8e2829f8 +DIST gitlab-ci-multi-runner-1.8.0-prebuilt-arm.tar.xz 9502124 SHA256 78a4cee8b91e7a13568104da7c39d526f08f26d946b59cca7bb94b9dc9f87be7 SHA512 2fab0a4088b67ff3be67734f5abfe67301c3ced9d7cf952b4fb71322395f582604aeb28ad3d6338d4890d7b743f76a6d7a297f7435f83778843d4eda02b90e36 WHIRLPOOL c7025ba1d0181388d92c07c2ed67befec2982fbfa74c112b7dbfacd23a0052fe99e6555a926c1cc99d638c0a00c1385bff9d5637624ca26f62891f213e62d8fb +DIST gitlab-ci-multi-runner-1.8.0-prebuilt-x86_64.tar.xz 8560472 SHA256 9588eb55ade4e323bd5bfeffd3bfc119659d0c2075e18c5bb003a4d79b834839 SHA512 2406ea113cf9d08ccafebc7c79cd42adba5f35a5ccfb282856b7e6c187402d9ef41ceaac973133579afd52933ff7a59bea4e57820f1374f33c748f636701f77e WHIRLPOOL 93d20c9d5660d3c00cc45063cb49d14a2442328d6782e4abe0b1a1fca5d1e612d27e1c88eb834cd12bb745e7d94121e922199fb77dce287f68bcda6c1a8f44c0 +DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374725ff21f49cb2869f4c5b897bb52e40bdc5aa0ba SHA512 1fb20e359ada1612d6f6120061e62af31410f445d789104f958f3561c8a6479048dedda2338cf01a10197a42da708c31ce3174d1218f94f9f9c88c0dd7d0f29f WHIRLPOOL bb4b22ef4862e0251125e2354342ddeaa0b680662c4c8ec1ce8d223155976ae71a7c6b135774de74294493259a3f2758bb0a78f5f27818569ff7e98ccf8ca966 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812 -MISC ChangeLog 714 SHA256 0f25cf56f039852a47fc1a86f09bf43e24295913799be6ee747946c3e5f19b48 SHA512 2f905e4bb1ae863e77e5a5ff95049a276faa1dfe15a2751a7fce583fa5e18a23995df6a38ded969ce444e110bffbfb320027ba2ac5d35d43908e11627b42224e WHIRLPOOL 7e3de88c9e79cd0aa141e6075a5e88ccf79392b5651d51f829efb59be7aecf8c32594ad319bef8e43ca7ff36a5189a197464ac940125d94f6ede25d3fe65b55c +EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4 +MISC ChangeLog 970 SHA256 6b782cc9d2618b14bde5cd1349d0fbb0c5f8cf8d26334940957eddc03bcdf023 SHA512 5e14b351e0027c93dfece9e7c3699041462a88bdf925bfe98c769c85db062788dee1db83fe7f6531bf649e18bf1d32d36bd56a2df6a08e9df2dc2befa57d327f WHIRLPOOL 8ce90d38d3de5e56eb0d00532bcc50fcee32853bda97b57e913a9afd00e1e81dc1f8c4e63ab30e1979da2ff340bbf4990d7c6dca432d2c6d94bb5ec18f33043a MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch new file mode 100644 index 0000000..4ee1459 --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch @@ -0,0 +1,70 @@ +diff --git a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile +index af9470e..099df3e 100644 +--- a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile ++++ b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile +@@ -1,30 +1,21 @@ + NAME ?= gitlab-ci-multi-runner + PACKAGE_NAME ?= $(NAME) + PACKAGE_CONFLICT ?= $(PACKAGE_NAME)-beta +-VERSION := $(shell ./ci/version) +-REVISION := $(shell git rev-parse --short HEAD || echo unknown) +-BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) ++VERSION := @@VERSION@@ ++REVISION := @@REVISION@@ ++BRANCH := @@BRANCH@@ + BUILT := $(shell date +%Y-%m-%dT%H:%M:%S%:z) + +-LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) +-export IS_LATEST := +-ifeq ($(shell git describe --exact-match --match $(LATEST_STABLE_TAG) >/dev/null 2>&1; echo $$?), 0) + export IS_LATEST := true +-endif + + PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner + PACKAGE_CLOUD_URL ?= https://packagecloud.io/ +-BUILD_PLATFORMS ?= -os '!netbsd' -os '!openbsd' ++BUILD_PLATFORMS ?= -osarch '@@OSARCH@@' + S3_UPLOAD_PATH ?= master +-DEB_PLATFORMS ?= debian/wheezy debian/jessie debian/stretch debian/buster \ +- ubuntu/precise ubuntu/trusty ubuntu/utopic ubuntu/vivid ubuntu/wily ubuntu/xenial \ +- raspbian/wheezy raspbian/jessie raspbian/stretch raspbian/buster \ +- linuxmint/petra linuxmint/qiana linuxmint/rebecca linuxmint/rafaela linuxmint/rosa +-DEB_ARCHS ?= amd64 i386 armel armhf +-RPM_PLATFORMS ?= el/6 el/7 \ +- ol/6 ol/7 \ +- fedora/20 fedora/21 fedora/22 fedora/23 +-RPM_ARCHS ?= x86_64 i686 arm armhf ++DEB_PLATFORMS ?= debian/wheezy ++DEB_ARCHS ?= amd64 ++RPM_PLATFORMS ?= fedora/23 ++RPM_ARCHS ?= x86_64 + COMMON_PACKAGE_NAMESPACE=$(shell go list ./common) + + # Packages in vendor/ are included in ./... +@@ -77,7 +68,7 @@ verify: fmt vet lint complexity test + deps: + # Installing dependencies... + go get -u github.com/golang/lint/golint +- go get github.com/mitchellh/gox ++ go get github.com/fritteli/gox + go get golang.org/x/tools/cmd/cover + go get github.com/fzipp/gocyclo + go get -u github.com/jteeuwen/go-bindata/... +@@ -108,7 +99,7 @@ else + $(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.xz) + $(warning =============================================) + curl -o out/docker/prebuilt-x86_64.tar.xz \ +- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz ++ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-x86_64.tar.xz + endif + + out/docker/prebuilt-arm.tar.xz: $(GO_FILES) +@@ -136,7 +127,7 @@ else + $(warning WARNING: and remove out/docker/prebuilt-arm.tar.xz) + $(warning =============================================) + curl -o out/docker/prebuilt-arm.tar.xz \ +- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz ++ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-arm.tar.xz + endif + + executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.xz out/docker/prebuilt-arm.tar.xz diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild new file mode 100644 index 0000000..3680aaf --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..." + +MY_PV="v${PV/_/-}" +MY_BRANCH="1-8-stable" +MY_GIT_HASH="734bc5d" + +DESCRIPTION="Official GitLab CI Runner written in Go" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz + !docker-build? ( + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz + )" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/${PVR}" +IUSE="docker-build" + +DEPEND=">=dev-go/gox-0.3.1_alpha + >=dev-go/go-bindata-0_pre20151023 + docker-build? ( >=app-emulation/docker-1.5 ) + !dev-vcs/gitlab-ci-multi-runner-bin" + +RESTRICT="test" + +MY_USER="gitlab_ci_multi_runner" +MY_HOME_DIR="/opt/gitlab-ci-multi-runner" + +pkg_setup() { + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER} +} + +src_prepare() { + if ! use docker-build; then + mkdir -p src/${EGO_PN%/*}/out/docker || die + cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-x86_64.tar.xz || die + cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-arm.tar.xz || die + else + einfo "You need to have docker running on your system during build time" + einfo "$(docker info)" + fi + + epatch "${FILESDIR}/0001-fix-Makefile-1.8.0.patch" + local arch="$(usev amd64)$(usev x86)$(usev arm)$(usev arm64)" + + sed -i -E \ + -e "s/@@VERSION@@/v${PV/_/-}/" \ + -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ + -e "s/@@BRANCH@@/${MY_BRANCH}/" \ + -e "s|@@OSARCH@@|linux/${arch}|" \ + src/gitlab.com/gitlab-org/${PN}/Makefile + + eapply_user +} + +src_compile() { + emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build +} + +src_install() { + golang-build_src_install + dobin bin/* + dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG.md + + # set up dirs + # here be the builds + diropts -m755 + dodir ${MY_HOME_DIR} + + # here be my home and my castle + local conf="/etc/gitlab-runner" + diropts -m750 + dodir ${conf} + + dosym ${conf} ${MY_HOME_DIR}/.gitlab-runner + + # fix permissions + fowners -R ${MY_USER}:${MY_USER} ${MY_HOME_DIR} ${conf} + + # rc script + local rcscript="${PN}.init" + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|" \ + -e "s|@HOME@|${MY_HOME_DIR}|" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${PN}" + newconfd "${FILESDIR}/${PN}.conf" "${PN}" +} + +pkg_postinst() { + elog + elog "If this is a fresh install of GitLab CI Multi Runner, please configure it" + elog "with the following command:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" +} + +pkg_config() { + einfo "You need to register the runner with your GitLab CI instance. Please" + einfo "Follow the instructions at" + einfo + einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md" + einfo + einfo "Perhaps I'll improve the ebuild later ... kthxbye." +}