linux/gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull requests 1 Releases Wiki Activity Actions

Merge branch 'fix-gitlab-ce-9.0.0-ebuild' into 'master'

Browse source 
Fix gitlab ce 9.0.0 ebuild

See merge request !158
This commit is contained in:
Manuel Friedli 2017-03-28 17:28:59 +02:00
commit b54c2dd31e
4 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
www-apps/gitlab-ce/ChangeLog
View file

@ -1,3 +1,13 @@
28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0.ebuild,
gitlab-ce-9999.ebuild:
www-apps/gitlab-ce: Moved warning about MySQL migrations to the postinst
phase, as the config phase might fail when the database is not updated. So the
message must be displayed earlier.
28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0.ebuild,
gitlab-ce-9999.ebuild:
www-apps/gitlab-ce: Fixed the latest ebuild to use yarn instead of npm.
*gitlab-ce-9.0.0 (28 Mar 2017) *gitlab-ce-9.0.0 (28 Mar 2017)
28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.0.ebuild: 28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.0.ebuild:

6
www-apps/gitlab-ce/Manifest
View file

@ -23,8 +23,8 @@ DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea
EBUILD gitlab-ce-8.15.8.ebuild 11982 SHA256 755bfd6fa532a308d3f458db1456f8de4f2c5f599ab76c18653aad9e038d0697 SHA512 9aa439da7dc61687f1cdce5ff693dd1c8c4edc54aaed288ad0368aa1b64d577a7f3752dee149c200c4d98b43a6347c77251cac9f6d3316b5a6d799a17c3ed583 WHIRLPOOL 02393bfd983341632663096e8b293e3611ac5328a58a50a1c7e800e348e866f37aff53ebe447507a84d5966e019265fde94a30716f43b50228437e04abcd932c EBUILD gitlab-ce-8.15.8.ebuild 11982 SHA256 755bfd6fa532a308d3f458db1456f8de4f2c5f599ab76c18653aad9e038d0697 SHA512 9aa439da7dc61687f1cdce5ff693dd1c8c4edc54aaed288ad0368aa1b64d577a7f3752dee149c200c4d98b43a6347c77251cac9f6d3316b5a6d799a17c3ed583 WHIRLPOOL 02393bfd983341632663096e8b293e3611ac5328a58a50a1c7e800e348e866f37aff53ebe447507a84d5966e019265fde94a30716f43b50228437e04abcd932c
EBUILD gitlab-ce-8.16.8.ebuild 11982 SHA256 31537d4a6aeb9ff14ab14c9a27dca51a056e94ee75506ad855a1289f32468694 SHA512 01d536fcfb53a7b39943314a34eeeb9c5b5660604a2fb1a1c2dcd1d7e87d19ab0bbc5bc650feaa1db812047c3783a324d7c8a8bce7dd7381033c3d1ca2e64828 WHIRLPOOL 0f3402e30164ee6d5058c51554cc916d91d5975f438074e3193bf3bdb4e323bca4279c19f00cd7bacd01c2eb6cf13e41a0badabd958e9be58d319224f53403b0 EBUILD gitlab-ce-8.16.8.ebuild 11982 SHA256 31537d4a6aeb9ff14ab14c9a27dca51a056e94ee75506ad855a1289f32468694 SHA512 01d536fcfb53a7b39943314a34eeeb9c5b5660604a2fb1a1c2dcd1d7e87d19ab0bbc5bc650feaa1db812047c3783a324d7c8a8bce7dd7381033c3d1ca2e64828 WHIRLPOOL 0f3402e30164ee6d5058c51554cc916d91d5975f438074e3193bf3bdb4e323bca4279c19f00cd7bacd01c2eb6cf13e41a0badabd958e9be58d319224f53403b0
EBUILD gitlab-ce-8.17.4.ebuild 12928 SHA256 f748d42058293ba4f593fbb36be34ecde332d896d04c610fd3b7e91288c18fbb SHA512 3c2736f9b7df066bb105faffef6ce2b6276fe60a686a7462c630a1b7c7c0296d94e33c7ea25a9f24aa814628f318e2430a3e5ca149783c86ef3fb1132dd01877 WHIRLPOOL cd629ba993df3eaef9c9ec1bf1649aa4cfea5f3787d2207a7016c092bff67175d79c6782d643d4c80b3b5971a98858feaa279a184abc4fd936c7e5c8b291dd28 EBUILD gitlab-ce-8.17.4.ebuild 12928 SHA256 f748d42058293ba4f593fbb36be34ecde332d896d04c610fd3b7e91288c18fbb SHA512 3c2736f9b7df066bb105faffef6ce2b6276fe60a686a7462c630a1b7c7c0296d94e33c7ea25a9f24aa814628f318e2430a3e5ca149783c86ef3fb1132dd01877 WHIRLPOOL cd629ba993df3eaef9c9ec1bf1649aa4cfea5f3787d2207a7016c092bff67175d79c6782d643d4c80b3b5971a98858feaa279a184abc4fd936c7e5c8b291dd28
EBUILD gitlab-ce-9.0.0.ebuild 12928 SHA256 55c3b39745547beac38b04d52b1c41caf2965179fa6d23cb0856f886fbe20431 SHA512 1557d9be66a033e1a9e94eb657342035f47f044cc4defd7eff35701554e47372794de5d7e1d1a94aa7ba7355990845ef8ac779aa449f06276ef52cafc9294d55 WHIRLPOOL e665021ba141205db52a8cf4be5a7f38c897967393a6f122fcbe93789008a991bfd2e6ced57873315434183898f21a5f13dc44a662e5cea309fd2f710895235b EBUILD gitlab-ce-9.0.0.ebuild 13008 SHA256 3b390e22aa0eda10dafe4c37cc4ccb2ff7e9b4cbbeeba6a64df7255e3440daf6 SHA512 d9f659414d380af24f4fb871f3c50062056b2aebef8f8fae7203b49a9102e55acc6c4be0840575de0953317d3a4fe6b4a4603121072b59cb0459927236cd9434 WHIRLPOOL 667ac5e2ba8ac7406dbd30e84ae13370eb3b55855e0319073d9295b9d8fbaa5f1e4f47b8ed2603394d77744d797512c653894c55a55ae676b87938d122fcdb5a
EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f
EBUILD gitlab-ce-9999.ebuild 12869 SHA256 4a1e486e7386aa942bbd22c29457850584dab007b64715fc6f316ce5c98fcaf8 SHA512 ed66b809ca6e04956a9d4f5ef027aa9e174bad5cd80131a30fc34a1011f0221483b6fb52e893394b429d70919fc65496711a9c700c630c2ff31665827912df82 WHIRLPOOL b1b2582dcb1f600f199216c1bb532eac524ff3cce594e052039be29547164557997c65573f943c00240ab0986b0f1c1315602c3a65a0986e9f64a2df1827288e EBUILD gitlab-ce-9999.ebuild 12949 SHA256 29d8125cbb7bd6d80623f54e1de2c18f7fde2301f5b94238853e2d717f920ad8 SHA512 c537716f9288e09c79508db89d21641424e36f491914aef8102734e8edd12a239f0b839d1ecfdaaf28b6bd19dd324479da3478db74611f97d875b6d5156cbac9 WHIRLPOOL 0a8403ad5f4284e5ec742eec5b6b83124f4a218adacee63cd413e3889934d1511f229d42502d50977cb2b9881f86c0e73e57c4a5421b119c5c44f56f9f8f3a92
MISC ChangeLog 16217 SHA256 0c9f7b191006123750250bbaa1ee8eed779e4074051fb4b5b29de3cb0c2ef5d2 SHA512 cd1b669ed6bb3c3cd6f44343481d09c2ad4d8df5ab0217676ff49408a46e3b20ff746af78dc647c374c4d5d88f876c2eceb7444f83269fa027a6c40ec7698c9d WHIRLPOOL 94c4744827a3dba8175139cd1d9566ed264619be9f601208b4dec39cf8f2f33a4bd36507263eac7efb2a454cd197bc7ee801090b5cdd423a4aaecf3ee0443579 MISC ChangeLog 16689 SHA256 2d5d8b27ed34fa65b56108d2376b4bab7bf363831ade050675139e59b3b41652 SHA512 c2e27a088aa56a1a0cd0697449676b265eb43cd6b914c01913bc747384aa7dfa4ef90499333e257282d8c500cd1fc7e9bcfe85aed381dda315db17fe849f52b2 WHIRLPOOL 80c5160dc809f4f71a9c8c09a34ab5e69947889afce6d965969309b1a5e14de935521f4e277dfcc4e5c7a7abf37793d365ba537e9cc699f94152c5801f928dbf
MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e

19
www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
View file

@ -286,6 +286,11 @@ pkg_postinst() {
elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;"
elog "For details, see the documentation at the GitLab website." elog "For details, see the documentation at the GitLab website."
fi fi
if use mysql ; then
ewarn "PLEASE also read this document about needed migrations on MySQL:"
ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
ewarn "Failing to follow those instructions may make the config phase fail!"
fi
} }
pkg_config() { pkg_config() {
@ -339,7 +344,7 @@ pkg_config() {
exec_rake migrate_iids exec_rake migrate_iids
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_npm install exec_yarn install
einfo "Cleaning old precompiled assets ..." einfo "Cleaning old precompiled assets ..."
exec_rake gitlab:assets:clean exec_rake gitlab:assets:clean
@ -360,7 +365,7 @@ pkg_config() {
exec_rake gitlab:setup exec_rake gitlab:setup
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_npm install exec_yarn install
fi fi
einfo "Precompiling assests ..." einfo "Precompiling assests ..."
@ -373,10 +378,6 @@ pkg_config() {
ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
ewarn "for any additional migration tasks specific to your previous GitLab" ewarn "for any additional migration tasks specific to your previous GitLab"
ewarn "version." ewarn "version."
if use mysql ; then
ewarn "PLEASE also read this document about needed migrations on MySQL:"
ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
fi
fi fi
elog elog
elog "If you want to make sure that the install/upgrade was successful, start" elog "If you want to make sure that the install/upgrade was successful, start"
@ -408,13 +409,13 @@ exec_rake() {
|| die "failed to run rake $@" || die "failed to run rake $@"
} }
exec_npm() { exec_yarn() {
local command="npm $@ --${RAILS_ENV}" local command="yarn $@ --${RAILS_ENV}"
echo " ${command}" echo " ${command}"
su -l ${MY_USER} -c " su -l ${MY_USER} -c "
export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
cd ${DEST_DIR} cd ${DEST_DIR}
${command}" \ ${command}" \
|| die "failed to run npm $@" || die "failed to run yarn $@"
} }

19
www-apps/gitlab-ce/gitlab-ce-9999.ebuild
View file

@ -290,6 +290,11 @@ pkg_postinst() {
elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;"
elog "For details, see the documentation at the GitLab website." elog "For details, see the documentation at the GitLab website."
fi fi
if use mysql ; then
ewarn "PLEASE also read this document about needed migrations on MySQL:"
ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
ewarn "Failing to follow those instructions may make the config phase fail!"
fi
} }
pkg_config() { pkg_config() {
@ -343,7 +348,7 @@ pkg_config() {
exec_rake migrate_iids exec_rake migrate_iids
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_npm install exec_yarn install
einfo "Cleaning old precompiled assets ..." einfo "Cleaning old precompiled assets ..."
exec_rake gitlab:assets:clean exec_rake gitlab:assets:clean
@ -364,7 +369,7 @@ pkg_config() {
exec_rake gitlab:setup exec_rake gitlab:setup
einfo "Installing npm modules ..." einfo "Installing npm modules ..."
exec_npm install exec_yarn install
fi fi
einfo "Precompiling assests ..." einfo "Precompiling assests ..."
@ -377,10 +382,6 @@ pkg_config() {
ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
ewarn "for any additional migration tasks specific to your previous GitLab" ewarn "for any additional migration tasks specific to your previous GitLab"
ewarn "version." ewarn "version."
if use mysql ; then
ewarn "PLEASE also read this document about needed migrations on MySQL:"
ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
fi
fi fi
elog elog
elog "If you want to make sure that the install/upgrade was successful, start" elog "If you want to make sure that the install/upgrade was successful, start"
@ -412,13 +413,13 @@ exec_rake() {
|| die "failed to run rake $@" || die "failed to run rake $@"
} }
exec_npm() { exec_yarn() {
local command="npm $@ --${RAILS_ENV}" local command="yarn $@ --${RAILS_ENV}"
echo " ${command}" echo " ${command}"
su -l ${MY_USER} -c " su -l ${MY_USER} -c "
export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
cd ${DEST_DIR} cd ${DEST_DIR}
${command}" \ ${command}" \
|| die "failed to run npm $@" || die "failed to run yarn $@"
} }