From: Elan Ruusamäe Date: Tue, 26 Sep 2017 13:59:23 +0000 (+0300) Subject: rename to gitlab-runner as upstream, version 10.0 X-Git-Tag: auto/th/gitlab-runner-10.0.2-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgitlab-runner.git;a=commitdiff_plain;h=8264fff rename to gitlab-runner as upstream, version 10.0 --- diff --git a/gitlab-ci-multi-runner.init b/gitlab-runner.init similarity index 88% rename from gitlab-ci-multi-runner.init rename to gitlab-runner.init index e54cab8..0fad0e0 100755 --- a/gitlab-ci-multi-runner.init +++ b/gitlab-runner.init @@ -1,22 +1,22 @@ #!/bin/sh # -# gitlab-ci-multi-runner GitLab CI-Multi Runner +# gitlab-runner GitLab Runner # # chkconfig: 345 20 80 # description: Enables automatic start of runners at boot time in the background -# processname: gitlab-ci-multi-runner +# processname: gitlab-runner # Source function library . /etc/rc.d/init.d/functions -DESC="GitLab CI-Multi Runner" +DESC="GitLab Runner" USER="gitlab-runner" GROUP="gitlab-runner" CHDIR="/var/lib/gitlab-runner" -NAME="gitlab-ci-multi-runner" +NAME="gitlab-runner" DAEMON="/usr/bin/gitlab-runner" -PIDFILE="/var/run/gitlab-ci-multi-runner.pid" -LOGFILE="/var/log/gitlab-ci-multi-runner.log" +PIDFILE="/var/run/gitlab-runner.pid" +LOGFILE="/var/log/gitlab-runner.log" # Read configuration variable file if it is present [ -f /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME diff --git a/gitlab-ci-multi-runner.service b/gitlab-runner.service similarity index 82% rename from gitlab-ci-multi-runner.service rename to gitlab-runner.service index 6985f30..938d9e0 100644 --- a/gitlab-ci-multi-runner.service +++ b/gitlab-runner.service @@ -2,7 +2,7 @@ # systemd unit file for CentOS 7, Ubuntu bleeding edge # [Unit] -Description=GitLab CI-Multi Runner +Description=GitLab Runner # start us only once the network and logging subsystems are available After=syslog.target network.target @@ -13,7 +13,7 @@ After=syslog.target network.target Type=simple User=gitlab-runner Group=gitlab-runner -ExecStart=/usr/bin/gitlab-ci-multi-runner run +ExecStart=/usr/bin/gitlab-runner run # if we crash, restart RestartSec=1 @@ -22,7 +22,7 @@ Restart=on-failure # use syslog for logging StandardOutput=syslog StandardError=syslog -SyslogIdentifier=gitlab-ci-multi-runner +SyslogIdentifier=gitlab-runner [Install] WantedBy=multi-user.target diff --git a/gitlab-ci-multi-runner.spec b/gitlab-runner.spec similarity index 77% rename from gitlab-ci-multi-runner.spec rename to gitlab-runner.spec index 6ab8367..2d3f93c 100644 --- a/gitlab-ci-multi-runner.spec +++ b/gitlab-runner.spec @@ -1,17 +1,17 @@ Summary: The official GitLab CI runner written in Go -Name: gitlab-ci-multi-runner -Version: 9.5.0 -Release: 2 +Name: gitlab-runner +Version: 10.0.0 +Release: 1 License: MIT Group: Development/Building -Source0: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz -# Source0-md5: e3267a1caac208a5a396deb873da99a3 +Source0: https://gitlab.com/gitlab-org/gitlab-runner/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz +# Source0-md5: 767648a99974adf7c4efd4106f9afe69 Source3: %{name}.init Source4: %{name}.sysconfig Source5: %{name}.service Patch0: nodim_gz.patch Patch1: branch-preserver.patch -URL: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner +URL: https://gitlab.com/gitlab-org/gitlab-runner BuildRequires: git-core BuildRequires: golang >= 1.6 BuildRequires: rpmbuild(macros) >= 1.647 @@ -40,7 +40,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # go stuff %define _enable_debug_packages 0 %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v %{?debug:-x} %{?**}; -%define import_path gitlab.com/gitlab-org/gitlab-ci-multi-runner +%define import_path gitlab.com/gitlab-org/gitlab-runner %description This is the official GitLab Runner written in Go. It runs tests and @@ -51,11 +51,11 @@ integration service included with GitLab that coordinates the testing. %setup -qc # for doc -mv gitlab-ci-multi-runner-*/*.md . +mv gitlab-runner-*/*.md . # don't you love go? install -d src/$(dirname %{import_path}) -mv gitlab-ci-multi-runner-* src/%{import_path} +mv gitlab-runner-* src/%{import_path} cd src/%{import_path} %patch0 -p5 @@ -76,12 +76,12 @@ export PATH=$(pwd):$PATH %{__make} version | tee version.txt -CN=gitlab.com/gitlab-org/gitlab-ci-multi-runner/common -LDFLAGS="-X $CN.NAME=gitlab-ci-multi-runner -X $CN.VERSION=%{version} -X $CN.REVISION=%{version}" +CN=gitlab.com/gitlab-org/gitlab-runner/common +LDFLAGS="-X $CN.NAME=gitlab-runner -X $CN.VERSION=%{version} -X $CN.REVISION=%{version}" %gobuild # verify that version matches -./gitlab-ci-multi-runner -v > v +./gitlab-runner -v > v v=$(awk '$1 == "Version:" {print $2}' v) test "$v" = "%{version}" @@ -94,9 +94,6 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name} cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir} -# backward compat name for previous pld packaging -ln -s gitlab-runner $RPM_BUILD_ROOT%{_bindir}/gitlab-ci-multi-runner - %clean rm -rf $RPM_BUILD_ROOT @@ -126,11 +123,10 @@ fi %files %defattr(644,root,root,755) %doc README.md CHANGELOG.md -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gitlab-ci-multi-runner -%attr(754,root,root) /etc/rc.d/init.d/gitlab-ci-multi-runner +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gitlab-runner +%attr(754,root,root) /etc/rc.d/init.d/gitlab-runner %dir %attr(750,root,root) %{_sysconfdir}/gitlab-runner -%attr(755,root,root) %{_bindir}/gitlab-ci-multi-runner %attr(755,root,root) %{_bindir}/gitlab-runner -%{systemdunitdir}/gitlab-ci-multi-runner.service +%{systemdunitdir}/gitlab-runner.service %dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner %dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner/.gitlab-runner diff --git a/gitlab-ci-multi-runner.sysconfig b/gitlab-runner.sysconfig similarity index 100% rename from gitlab-ci-multi-runner.sysconfig rename to gitlab-runner.sysconfig