Merge branch '74-gitlab-ci-multi-runner-1-10-4' into 'master'

dev-vcs/gitlab-ci-multi-runner:

Closes #74

See merge request !140
This commit is contained in:
Manuel Friedli 2017-02-15 02:14:48 +01:00
commit 014117e83e
5 changed files with 203 additions and 4 deletions

View file

@ -1,3 +1,10 @@
*gitlab-ci-multi-runner-1.10.4 (15 Feb 2017)
15 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
+files/0001-fix-Makefile-1.10.4.patch, +gitlab-ci-multi-runner-1.10.4.ebuild,
gitlab-ci-multi-runner-1.9.2.ebuild:
dev-vcs/gitlab-ci-multi-runner: added ebuild for gitlab-ci-runner-1.10.4
*gitlab-ci-multi-runner-1.8.0 (23 Nov 2016) *gitlab-ci-multi-runner-1.8.0 (23 Nov 2016)
23 Nov 2016; Manuel Friedli <manuel@fritteli.ch> 23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>

View file

@ -1,7 +1,11 @@
AUX 0001-fix-Makefile-1.10.4.patch 3308 SHA256 c87a85a704ee054f85343d01e187933e67a6cca989adcf686a6f16a37406340d SHA512 bcd746a39997287334a77847322f11cbdc55c790540061f3bc9d9ac60ddc19683abf431e558c3e1a033f3ac3b5de0404da8ab82d2a3c254a214c1e0e80bfd76d WHIRLPOOL 71ec341a2e79a431062eb99c96bb2c7286858417e62c10082af48d5cd90de88a0eefd91a2bdda351e0bdbceea7452b79e88f83d566a79432c45ceaea5b7476c9
AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b 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 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.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a
AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f
DIST gitlab-ci-multi-runner-1.10.4-prebuilt-arm.tar.xz 8698116 SHA256 f3622932cc0e1013e9b999df68f00e6cfde148f56590cc2336806c9136b94dd3 SHA512 8ff0967105a0cd7d5041823b677a1bb990620c7cfe40975768691b738e37f72394323616c1783add5622696e645916caed18722d6b242974f49ee3da658bee8a WHIRLPOOL 7b76346e3de324bdc647e07cdfb2041af2574d1c4f885783661d5931a7bfc5864424f9f279cb3e3ca391194a2dd6a529a57ec2de831b06ed56d929fdb45c2d7c
DIST gitlab-ci-multi-runner-1.10.4-prebuilt-x86_64.tar.xz 8340744 SHA256 b3104c5fe3406e544a4cc1b0735c6bf6b66a8d09e8691efbcdd336061f534a33 SHA512 277576ef1a3bbe55f9fa67ea0c957ab1cd3d19ed402efb1124cc0784ab070606e5db973bbaeeee9208ee1f7d9334ff9e3edccc7efcd9a25ac4ae28fe3434b2d1 WHIRLPOOL 47bd79a33bb23d522dd51171a2701acbd6634ffbab885aa65e2f638a91e55f61496eb489280666492569c121adc99bcfc78cb2bc3da5c7812fe4337b40368797
DIST gitlab-ci-multi-runner-1.10.4.tar.gz 3571099 SHA256 91c1ad64bff9e727ede5d18590082eb57113634aa9cf55a4a1a205e6f28d7f3f SHA512 d47fd24e87afd4c261e526dccc97aaa6d6ac1a5744df85ad44752f49c8f72af59cedc0c6c24a19fcb9bbf8b8703261ecf9568fe69d3ca3012142f46ce8e82d86 WHIRLPOOL 69d6972bfaf97b76de86a853927f8e47ec2108d4c698c964d5908aa04b9981ceba634745122d94a7a4913254660285bc985ab973c306f289109019f6f0219b56
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-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-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.7.0.tar.gz 3527772 SHA256 ffcc18bfc54d4e2846bbfb21e72798c90ca5af214ac606ea07fbbeec24bb155f SHA512 06289c910f599ce180d62bad2e36cf4ac0f261f740c7ae3d4baf42aa4926b9dd2229b8c25ce8191613957017e1b1af4cdde76512eff2460f4a3db7f085a0e2a1 WHIRLPOOL 17d1259123bd0e8275f72453ba89e59f557e568b6698a0f61a511217b22a28d60350925928275072b1599cf4cf841d3f720eebd7a4e409627ad9257e8e2829f8
@ -11,8 +15,9 @@ DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374
DIST gitlab-ci-multi-runner-1.9.2-prebuilt-arm.tar.xz 16002708 SHA256 c4f7297865fafa4e7841e513a26b334cf9f29ad6d7ec4b12381d6031fa6f9648 SHA512 e1d905048bbfb1415f93a443e457ae47cd7f969eeae82f6dc5bcbdce37e2aa4219a97b97080c8b7767523490017cd8ec0fbf681375e27348e87c4d230db844ae WHIRLPOOL 0b76317c29b81dd53c7ae4c2b9f6bcdc7bcb28e6d5101a45f8c4eccf11259e88f2eac7751e84e6f5b3e91298e32980cabd1a1fd07c0cc260dfdde9e479f9c116 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-arm.tar.xz 16002708 SHA256 c4f7297865fafa4e7841e513a26b334cf9f29ad6d7ec4b12381d6031fa6f9648 SHA512 e1d905048bbfb1415f93a443e457ae47cd7f969eeae82f6dc5bcbdce37e2aa4219a97b97080c8b7767523490017cd8ec0fbf681375e27348e87c4d230db844ae WHIRLPOOL 0b76317c29b81dd53c7ae4c2b9f6bcdc7bcb28e6d5101a45f8c4eccf11259e88f2eac7751e84e6f5b3e91298e32980cabd1a1fd07c0cc260dfdde9e479f9c116
DIST gitlab-ci-multi-runner-1.9.2-prebuilt-x86_64.tar.xz 8717016 SHA256 7d0759dd04f930a231c1a713d8e44a149666112ff1d841c5173847a373496278 SHA512 aaf1b859dd353bca3810ebb85dca0fadbf7f728b262ef00f6a793e9eaf100a05466f26a8bd55acc0270876e5725519941f6086bb375d9f9285fce7f5bf66351c WHIRLPOOL 7e5af9b63feb36ba4e09b12faaa05cb31b453f8f98ded396005429db1f392cb370c75f0c9ddfc07e169cf77f9dceb4abac5abd195a30e2a3ccb03819275f55a5 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-x86_64.tar.xz 8717016 SHA256 7d0759dd04f930a231c1a713d8e44a149666112ff1d841c5173847a373496278 SHA512 aaf1b859dd353bca3810ebb85dca0fadbf7f728b262ef00f6a793e9eaf100a05466f26a8bd55acc0270876e5725519941f6086bb375d9f9285fce7f5bf66351c WHIRLPOOL 7e5af9b63feb36ba4e09b12faaa05cb31b453f8f98ded396005429db1f392cb370c75f0c9ddfc07e169cf77f9dceb4abac5abd195a30e2a3ccb03819275f55a5
DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a7a2d60ad892bf3b39fc48903861b241c7391e920 SHA512 7721cc80cd9abaf5ab44f53836e7718eb2df360cea378f4898ef6e9d6b671a09df1e69b70ac99ed8c6c042af9da6415e614db52b5c1e9476bbfe72e146628f04 WHIRLPOOL accb7458dd7ce1334e66f76ed90d970c5e6974505a2376a3e0c9e42d7169986aa18ed9dc64f11dac1366b42b4efddd18e1baa072d4f56e57d3a6c6300ee1f3bb DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a7a2d60ad892bf3b39fc48903861b241c7391e920 SHA512 7721cc80cd9abaf5ab44f53836e7718eb2df360cea378f4898ef6e9d6b671a09df1e69b70ac99ed8c6c042af9da6415e614db52b5c1e9476bbfe72e146628f04 WHIRLPOOL accb7458dd7ce1334e66f76ed90d970c5e6974505a2376a3e0c9e42d7169986aa18ed9dc64f11dac1366b42b4efddd18e1baa072d4f56e57d3a6c6300ee1f3bb
EBUILD gitlab-ci-multi-runner-1.10.4.ebuild 3266 SHA256 403a1b8eafa8bc74582cbdf7cd90b9c18ee72e1a386bae07fecb6adfcd56fece SHA512 802c5fafcdf7b997115bf70c01b168499bfd1b0cf78195a414ccb0ca1c5f58da3eeb5c8eb3d1960b049b0509e92682e13dac7a80549bf5f9f7c818d0f931ffd0 WHIRLPOOL 616be2cfd835f9912f0698321a230b2d242251556a519541dea18b9673f3b84d32d4095104d5620d326dc5db7934a9c222ca1d92cc157bcca341dd5862f03723
EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812
EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4
EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3271 SHA256 15167499bd8c8662b5332be9425fe7865ed19ec2b74aa49aef0de79add6736ae SHA512 dc291f755446862dff99ffcfabdf249f88c931bf65c55e68ad605f4fdc4de0d6c154f2f9136b8316417b279bbf7569f5b70c00e641a7a6c95f1a42b389560e6b WHIRLPOOL 616e79f0682844fda4ddadf398cb207529327a5fcd95f24aa1d5084e667c0aaa1a5aa7b577077de595ff10683fdb0d502b008a8aa3b1592cd0930699bf9a0c2f EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6
MISC ChangeLog 970 SHA256 6b782cc9d2618b14bde5cd1349d0fbb0c5f8cf8d26334940957eddc03bcdf023 SHA512 5e14b351e0027c93dfece9e7c3699041462a88bdf925bfe98c769c85db062788dee1db83fe7f6531bf649e18bf1d32d36bd56a2df6a08e9df2dc2befa57d327f WHIRLPOOL 8ce90d38d3de5e56eb0d00532bcc50fcee32853bda97b57e913a9afd00e1e81dc1f8c4e63ab30e1979da2ff340bbf4990d7c6dca432d2c6d94bb5ec18f33043a MISC ChangeLog 1263 SHA256 dd4844dd0c1ce8b2d149cbe8825e223196ab657386fa45dde96f4a938cf9d900 SHA512 d92876c2f338410778d190baa0a789b137967176c0947b692a5c983c4ef6fb3dd91103fd647b26ae205caeebe7699c7ddfc6c7d88b4dbcce3ce16840b13d9a25 WHIRLPOOL 8752eec01bfb29aefdf8c2a05617fad7a74537e6c231c70cdcf84e4df408365a42276970aacb8ed5d10ed30d383239aeb2f1792cf3727338fbd1940253cd0c86
MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35

View file

@ -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 7f51066..a0e8211 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
-export 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)
+export 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 ubuntu/yakkety \
- 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

View file

@ -0,0 +1,117 @@
# Copyright 1999-2017 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-10-stable"
MY_GIT_HASH="b32125f"
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 mirror"
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-${PV}.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."
}

View file

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$