diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog index 962c3d9..a335779 100644 --- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog @@ -1,61 +1,7 @@ -*gitlab-ci-multi-runner-1.7.0 (23 Oct 2016) - - 23 Oct 2016; Manuel Friedli - +gitlab-ci-multi-runner-1.7.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: added ebuild for version 1.7.0 - - 23 Sep 2016; Manuel Friedli - gitlab-ci-multi-runner-1.6.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: corrected description - -*gitlab-ci-multi-runner-1.6.0 (23 Sep 2016) - - 23 Sep 2016; Manuel Friedli - +gitlab-ci-multi-runner-1.6.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: added ebuild for gitlab-ci-multi-runner-1.6.0 - - 05 Sep 2016; Manuel Friedli - gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: fixed gitlab-ci-multi-runner ebuilds for - EAPI="6" - - 01 Sep 2016; Manuel Friedli - gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: updated to EAPI="6" - - 22 Aug 2016; Manuel Friedli - -gitlab-ci-multi-runner-1.3.2.ebuild: - dev-vcs/gitlab-ci-multi-runner: purged all ebuild versions - +gitlab-ci-multi-runner-1.5.0.ebuild: - dev-vcs/gitlab-ci-multi-runner: added gitlab-ci-multi-runner-1.5.0. to be - used along with gitlab-ce-8.11.0 - -*gitlab-ci-multi-runner-1.4.1 (26 Jul 2016) - - 26 Jul 2016; Manuel Friedli - +gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.1.4.ebuild, - -gitlab-ci-multi-runner-1.3.1.ebuild: - dev-vcs/gitlab-ci-multi-runner: - added ebuild for version 1.4.1 - deleted - ebuilds for versions <1.3.2 - -*gitlab-ci-multi-runner-1.3.2 (09 Jul 2016) - - 09 Jul 2016; Manuel Friedli - +gitlab-ci-multi-runner-1.3.2.ebuild: - dev-vcs/gitlab-ci-multi-runner: added ebuild for version 1.3.2 which contains - a bugfix for ARM - -*gitlab-ci-multi-runner-1.3.1 (26 Jun 2016) - - 26 Jun 2016; Manuel Friedli - +gitlab-ci-multi-runner-1.3.1.ebuild, -gitlab-ci-multi-runner-1.1.3.ebuild: - dev-vcs/gitlab-ci-multi-runner: - Added version 1.3.1 and purged old one - - 07 Jun 2016; Manuel Friedli +ChangeLog: - Added ChangeLog + 24 Oct 2016; Manuel Friedli + +files/0001-fix-Makefile.patch, -ChangeLog, + -gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.5.0.ebuild, + -gitlab-ci-multi-runner-1.6.0.ebuild, files/gitlab-ci-multi-runner.init, + gitlab-ci-multi-runner-1.7.0.ebuild, metadata.xml: + dev-vcs/gitlab-ci-multi-runner: added source version of gitlab-ci-multi- + runner; mostly copied from the mrueg overlay, but with some additional patches diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest index 4984067..a1d22e5 100644 --- a/dev-vcs/gitlab-ci-multi-runner/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner/Manifest @@ -1,20 +1,9 @@ +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 697 SHA256 4190607f9d9958b103f3a2ede2bbaa836b7498f89bdb6cd3fb5a5099db4e2521 SHA512 f683e6fe35a5b91142779fe78ef0cd06421d2c9b2e07cb48eb42fa8a373cf837ea56101804866ff73e28f1a4a4d683054e30265f82aec54b525e6dfb0936a025 WHIRLPOOL e819926ce3f81b26322d61c6bb1bba9c23afe9b8e01c3eb5ebc03ba32aedbf9ad25ac21704ae4e3690571b3bf1d5ffe87ed04cf7dd22fe63e2080cc84f36edaf -DIST gitlab-ci-multi-runner-1.4.1-amd64 59770288 SHA256 8efbffac459fab6bc0532ba09d527e5a93d1da521fd90b1ff6408a714fcc8261 SHA512 33d8a509def74caa937fbfb69dc4aae50266e1ffd83bcddd2e358649010602108bc99647192fd64e8bbd1892a18f27b69b704ea1b4fc6622ec0d8ee4fdd564c0 WHIRLPOOL 6fae8f2a04aa3a74506746906e91300e05ea3ca31cdf8a4fc8e092328277975832f80a56eee1e26359dd510ed135fd756fd11b3ad75e23284c92388c162f388a -DIST gitlab-ci-multi-runner-1.4.1-arm 56437360 SHA256 8f029a87d1ac1e1fc0f53249e8c8d9fc8f8c5191609a74521fdf626d6a9aec1e SHA512 9fbb8fd89a25e7f51354ec5d55bc4e1a60a166c39849ea4fa54435dbc48135ac8720a6f0cea2645fb449ceff5e74cfb402f33bb6aa75189eeeceb7a60abfba29 WHIRLPOOL 764c516580dec2bddfbcd270c4234f164256ab5801608875a9edbe59852e679c7f285a7ef09748662900add74fde6ebeeb2842e34cb208cd5858eed6dc60b1ec -DIST gitlab-ci-multi-runner-1.4.1-x86 56606472 SHA256 c4c1d15912a48a6de66a0093ad3db7a50e7c28c64dc250a328de3a120fa36baf SHA512 f394834d78cf743fa80d219b92e071a450f055d2eca38486f5b9aecf85e3daba10e370a14ac9bdb847fcea63b80101f98ed75b9f741944eadd14e0a9f2faa388 WHIRLPOOL 793e873eac8a85de75e4dc54456a21f9c235d5c83a6d19b039c4112f5d145ca373d8c4fc70b9bae9c137bb30fbe5ebaae81b7f03a904d634ede242829c482ba4 -DIST gitlab-ci-multi-runner-1.5.0-amd64 40162568 SHA256 8068a7c0a149cda3782ea58b29ac1f1dfb7018d2021359b2be6094493a86fbf0 SHA512 e06c2aa44d7c369bfa6315221bac19670c97268f64660a320fa9872f86991c1f3c3ef25a9cd233b5769bbf30e1a4958d347f7bbb991dbf10696666332d763314 WHIRLPOOL 4b9e5e06671955245116693d73e5158c0e6a9455127cf6703222a353467c3c57128df0ad682dc47db37b20f98e2a870b5e32344c69c64f301a4611c451305569 -DIST gitlab-ci-multi-runner-1.5.0-arm 36718736 SHA256 38849b5948d892b505f2d8b01b777ed4b22eea2a6ce91aeaf276c3ad6fcb56cd SHA512 14439be83d1f5cb3a2e2b67421138ef4b6ea2ed6636214f082f4db32786a6707c4299c23410ba6c54e06079358acdf84e3a0ee9c5280c17f06576463607187c4 WHIRLPOOL ca677e0d62323021ec477fa031cc1a8cab76757101abe7033c0c1da632f99d225c622792d07df93b935467a7ed987e2cbe6c4dd00e16f06ad3988d4bd21623d2 -DIST gitlab-ci-multi-runner-1.5.0-x86 36892864 SHA256 029e1a570ff5f5f570d107cb451b2a759829ba64fde6965a1d4abc6135ef63be SHA512 06d55f40e3d43ef3524266fec1c009372bb18850394ec5688979fe6bf33e3bf864aa0582ff0de5eb1e088ce2a24b09bdb6a2772643a15f4d8e994c7f194197a9 WHIRLPOOL 8ede1609492f33599078129a44c28eb58f850da715d091b847a753589a68cfac9f206f9c5e7b78eddad67a834279fbd4cd72a7fb5ea09075aa16729f70edeff2 -DIST gitlab-ci-multi-runner-1.6.0-amd64 81450584 SHA256 09dbfd1770253e4216de45e3de359707b9e48d1cd406fe7a7108f0d46880f9c8 SHA512 03c0f1a364509fceaea7c3250885f1d65349cc7b3b9febcb2b67f300b371fcf307f2e44f8c7da57776c05c57c350685459b0167f9dfe1d239d3c472d674dc35e WHIRLPOOL 80dd59f5343efd4a3f0278e66bb1ec7f9b64ed6c16580a9ea9c0554469bf668a7a1553c70e79ffe25e18fe6bea61d219112509ef30c38dc8cb56c4fccc4e37a4 -DIST gitlab-ci-multi-runner-1.6.0-arm 71394024 SHA256 ce42d293752d2781f1d657da6489ebf6f8df610df72742f144004fd12bf88cac SHA512 d23a95d367a9b68fc456fe67a7f243a824f0d1ddb5015740ede83297d328d31e34203ba4d49bac87a81bdefde1ae9aca401016777aaae33c9a4965441ae05381 WHIRLPOOL 8c0a70aab601d785400d1f0993581f41243ac4c01618cd8ff5dc60229cf2184a76adf7e9a1cc1b6ed99392a1aeb17177909dc78d877f71a4126a0990e57b6b8f -DIST gitlab-ci-multi-runner-1.6.0-x86 72066176 SHA256 ab59163f79e327a1bf6a6d1469762d1f113484b561c6c4dcc07fda127068d9f4 SHA512 ce9eb72e86bd9a2ccd40be585b8f4645d7eb471a4b35a79b4c91dedb95611162c60f2a5e098774ac0879d1dd97f98431372e47e9c5152971d11591a502b0e96f WHIRLPOOL b05f559e04756f2f7cd05a833dbdabf008a98cf1314a81021c76d1c9c2afd4df7d1d5f4c2a585ef97f72dfeef84f2c01e8a6cabba8b018e1ab99ae7ff106b3f4 -DIST gitlab-ci-multi-runner-1.7.0-amd64 68204551 SHA256 367ed93a9b37026bf1679d43e1d150c7edda151e5c5807e43a0b85706a368de6 SHA512 f516046b29b16ba51e9124aa6e2d97bf549628567cafe3e72c49160945f39ac954a31e7460460b06119b8baa59e3724c515aa6635f8cc7e845cfc4e647ca66bf WHIRLPOOL 25f41cbeff6d441bfd11d6cc2b335d594f67c2f995268fd2a65f2da021792abcb9877adcf8f27d33194ad8dcbcc26d96b3b86d193e448143d717ac6b9dd973c6 -DIST gitlab-ci-multi-runner-1.7.0-arm 64871891 SHA256 b30873ec3fbc1510fdd92e64afb1cd5bc11db295eb5da7d4d4931211a40d4d8d SHA512 0988ef4bbae45e114eed98a6bc47284df26b4d283aeda5ae6be17a79d7bc416e060234e30592c8d44804ee56cbdd45be33777edd4cde4f8a4cc101516aff613c WHIRLPOOL 77fd1538e7e7a1513e2b31ccc9998fb5aea95c974808ca4f56a3e60bcb37f216a37b1ca0ead5d826ccb8712a0554baee300d5fe845bf9fcdd6094be6a0e177ee -DIST gitlab-ci-multi-runner-1.7.0-x86 64635954 SHA256 4028364f26e9169f04e37beb404aebfaa5f0ad2560e6dccda302f9acd73e47a5 SHA512 56fea1b4b5de617b998c998edeb914eb0500de597fead2c37bd81526b48822c84a49c8263567c2f3ece3d2bab50287162b66fbeec5c0f9e1e2159c115a6c14ed WHIRLPOOL 3238e95cbd742b7057c224fb8d0a7511f7dcb0d1c0b07e446d2f0a4f6c7f4e6646e9b1c54cb14cd29c479efbaf113e5e501da54538983307ab8c3f350a36dac3 -EBUILD gitlab-ci-multi-runner-1.4.1.ebuild 2355 SHA256 c911b16ed3d1ff2ade77818f80e5e307f539a0dfad4647f6d2e242e970ca9bc2 SHA512 dd3b949a6494868e584655ede760a92e4a1084cb611b32c26c7850cc9c025860ac8814d94be58e43789137e5451cf633146d302d31c20a683cc7a2760ff84635 WHIRLPOOL bb1ee49e3ca9cc400dc1e11232f45acc51e9f47384742745ea01a709ae3e39f21b497948ef9a43ab5803e43c3c59c6770eba1169ef059d672296c3d9183f3da6 -EBUILD gitlab-ci-multi-runner-1.5.0.ebuild 2355 SHA256 ad37bca040f73fffda558d935f2cb1204c7c3d467c8c07f11d225bef813a4cb6 SHA512 87673b36f8a2c9fa872e5a55955c30c84c7664b2f2a3a9e3c293782747e71808651916e2dc8ce2c9f7aab319c06b5f2703c505e33303eebb2f3aec4369426415 WHIRLPOOL 3b000513d51581fa400699625e4dd3c949516df0cebdcb57b7c86ab9fdc01c0947934c7205ef31a8245fa1b8aaa7805211d5fbe4e5fc930f0de62c11e2dfe6f8 -EBUILD gitlab-ci-multi-runner-1.6.0.ebuild 2355 SHA256 d7afebafb33a353927ec7ea9eb45dfa0e55481ea84f8ebc1dccb735769225a0e SHA512 ba76ee30891ad1f6bce1c7f7982a9b6f3a5dfb1b6747c32703d3980a6f5966c6185a16f4bc4cf545a88fa962e64f91dfae26c7a8537bb8b79e3328313d9e42b6 WHIRLPOOL 292337cc95bb7376a2a88d8cf0056b2eaf807b784d3a81c22235680fafaf69b642a838d2a2d87826093d94c5399c79e0d5cda4afb101725927da51e55c18f63e -EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 2355 SHA256 d7afebafb33a353927ec7ea9eb45dfa0e55481ea84f8ebc1dccb735769225a0e SHA512 ba76ee30891ad1f6bce1c7f7982a9b6f3a5dfb1b6747c32703d3980a6f5966c6185a16f4bc4cf545a88fa962e64f91dfae26c7a8537bb8b79e3328313d9e42b6 WHIRLPOOL 292337cc95bb7376a2a88d8cf0056b2eaf807b784d3a81c22235680fafaf69b642a838d2a2d87826093d94c5399c79e0d5cda4afb101725927da51e55c18f63e -MISC ChangeLog 2294 SHA256 d449d54ce814dc2fcfb5efab396ebd907f591036e2033db4e27ba5fb5aa555e4 SHA512 0c6e692dc0495aaefcfdbe1c5d4a99679af5b389a51985732f4285d698584f07398db7b6847526ecd2c01feabae6d4c88820c49105f8d77d72cd3aade5e40b61 WHIRLPOOL 53d6c347f27b7a6c634bf34e07fc1fbc9b637ab2b117fbdd6069b42b0f7955a1157011954bbfba368a6c830fd231dcc1ace542499e56cc5c2b98c224d94d41e5 -MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 +AUX gitlab-ci-multi-runner.init 702 SHA256 7a19a20f0b3138a86d805872706ebc2918b01663cfdb351aa2d2cb89707602e9 SHA512 005e10a1c2974209f74efb5899d8f7627284947b716049a5211a2c5767a43b7a629061d96a6f445646f88cdb4afb9918fc2d154d68fabd4fe8ec4e0b9fd0125f WHIRLPOOL 85100f9a311ce1a39adddc10dee5af7862dceff5ae24e30c2830b74cdf78d74357fc0f0b43010a79909caf31e33439f0facc5dbd8e87b6452180093d1058eb3d +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 +EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 1959 SHA256 88fc294a346844f9dd95448f566266572216397aa30e988ff4d919eee86391df SHA512 38c9b13a0c2f468f46657b5d4840bd0b473556789b4c6de8459033259c34c5e9f2b51a3b4961d039cf6807a238bf62f7206c6ea18fc4930e3c346ddb81e6f9e4 WHIRLPOOL c3c73bd802c446b08e85828e0d28a2611ed6e4a99ce3173905a5d5e1276caddaa81664c9b8d40e0c052ba95bf9313c0fee24551912812017bb38ef466299100c +MISC ChangeLog 460 SHA256 e3043e75de553336ee302b1d4a05843aa076eee5396a57edfe29bea05aed7bdf SHA512 5e1ecb125bf027b7e08bfa538a486d29a9ca2c4aa516e5acac2307dae90631dae0d76202a98232e11597c44601b6279a023aee7b7082d07ddd2ffb0844e03ea9 WHIRLPOOL 1607b339be49016ab4c5bc3eff2ee072a7528cfd7a93fed3b3edb015af7890ede57500a55a16bfd7f87caa5625a517cd012cf5b850bd41340d49af4f1f9b8b33 +MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch new file mode 100644 index 0000000..9a5fc61 --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch @@ -0,0 +1,74 @@ +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..d615542 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,10 +68,10 @@ 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/... ++ go get -u github.com/fritteli/go-bindata/... + go install cmd/vet + + out/docker/prebuilt-x86_64.tar.xz: $(GO_FILES) +@@ -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/files/gitlab-ci-multi-runner.init b/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init index e1c2471..b861f14 100644 --- a/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init +++ b/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2015 Nicolas Heine +# Copyright 2015-2016 Nicolas Heine depend() { after sshd diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild deleted file mode 100644 index 449c6b0..0000000 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils user - -DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.10" -HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" - -DEPEND="dev-vcs/git" -RDEPEND="${DEPEND} - net-libs/nodejs - virtual/mta" - -MY_NAME="${PN}" -MY_USER="gitlab_ci_multi_runner" - -DEST_DIR="/opt/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" -RUN_DIR="/run/${MY_NAME}" - -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}/${PN}" -} - -src_prepare() { - chmod +x "${S}/${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}/${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_NAME}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}" -} - -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/gitlab-ci-multi-runner-1.5.0.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.5.0.ebuild deleted file mode 100644 index 480c4c1..0000000 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.5.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils user - -DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.11" -HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" - -DEPEND="dev-vcs/git" -RDEPEND="${DEPEND} - net-libs/nodejs - virtual/mta" - -MY_NAME="${PN}" -MY_USER="gitlab_ci_multi_runner" - -DEST_DIR="/opt/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" -RUN_DIR="/run/${MY_NAME}" - -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}/${PN}" -} - -src_prepare() { - chmod +x "${S}/${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}/${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_NAME}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}" -} - -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/gitlab-ci-multi-runner-1.6.0.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.6.0.ebuild deleted file mode 100644 index e1d4ee9..0000000 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.6.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils user - -DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.12" -HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" - -DEPEND="dev-vcs/git" -RDEPEND="${DEPEND} - net-libs/nodejs - virtual/mta" - -MY_NAME="${PN}" -MY_USER="gitlab_ci_multi_runner" - -DEST_DIR="/opt/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" -RUN_DIR="/run/${MY_NAME}" - -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}/${PN}" -} - -src_prepare() { - chmod +x "${S}/${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}/${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_NAME}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}" -} - -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/gitlab-ci-multi-runner-1.7.0.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild index e1d4ee9..35d11d3 100644 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild +++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild @@ -2,100 +2,64 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="6" +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot -inherit eutils user +EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..." -DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.12" +MY_PV="v${PV/_/-}" +MY_BRANCH="1-7-stable" +MY_GIT_HASH="c66b00d" + +DESCRIPTION="Official GitLab CI Runner written in Go" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" - -RESTRICT="mirror" +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" -KEYWORDS="~amd64 ~x86 ~arm" +SLOT="0/${PVR}" +IUSE="docker-build" -DEPEND="dev-vcs/git" -RDEPEND="${DEPEND} - net-libs/nodejs - virtual/mta" +DEPEND=">=dev-go/gox-0.3.1_alpha + >=dev-go/go-bindata-3.0.8_alpha + docker-build? ( >=app-emulation/docker-1.5 ) + !dev-vcs/gitlab-ci-multi-runner-bin" -MY_NAME="${PN}" -MY_USER="gitlab_ci_multi_runner" - -DEST_DIR="/opt/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" -RUN_DIR="/run/${MY_NAME}" - -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}/${PN}" -} +RESTRICT="test" src_prepare() { - chmod +x "${S}/${PN}" + 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.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() { - # nothing to compile, binary all-in-one goodness! (?) - : + emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build } src_install() { - local dest=${DEST_DIR} - local conf="/etc/gitlab-runner" - - diropts -m755 - dodir ${dest} - - exeinto ${dest} - doexe "${S}/${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_NAME}.init" - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}" -} - -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." + golang-build_src_install + dobin bin/* + dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG.md } diff --git a/dev-vcs/gitlab-ci-multi-runner/metadata.xml b/dev-vcs/gitlab-ci-multi-runner/metadata.xml index 67a771c..d2bcf7b 100644 --- a/dev-vcs/gitlab-ci-multi-runner/metadata.xml +++ b/dev-vcs/gitlab-ci-multi-runner/metadata.xml @@ -5,4 +5,7 @@ manuel@fritteli.ch Manuel Friedli + + Use docker to build the images +