Accepting request 786027 from home:ojkastl_buildservice:Branch_grafana
update to 6.6.2; use go_modules service to provide dependencies in vendor.tar.gz; BuildRequires go1.14 to build successfully; adjust Makefile and README to current requirements for 6.6.2 (npm12, not npm10);adjust Makefile to fully work with new file names OBS-URL: https://build.opensuse.org/request/show/786027 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=30
This commit is contained in:
Witek Bedyk
Git OBS Bridge
parent
89794e01f3
commit
19ad1a3209
7
Makefile
7
Makefile
@ -8,7 +8,7 @@ verify-deps:
|
||||
@which grunt >/dev/null 2>&1 || ( echo "grunt not found; run \`sudo npm install -g grunt-cli\`" && false )
|
||||
|
||||
clean:
|
||||
rm -f $(NAME)-*.tar $(NAME)-*.tar.xz
|
||||
rm -f $(NAME)-*.tar $(NAME)-*.tar.gz
|
||||
|
||||
tar:
|
||||
osc service disabledrun
|
||||
@ -18,6 +18,7 @@ tar:
|
||||
tar=$$basename.tar && \
|
||||
tmpdir=$$(mktemp -d -p .) && \
|
||||
cd $$tmpdir && \
|
||||
gunzip ../$$tar.gz && \
|
||||
tar -xf ../$$tar && \
|
||||
cd $$basename && \
|
||||
# exclude the phantomjs-prebuilt binary module from the webpack \
|
||||
@ -32,8 +33,6 @@ tar:
|
||||
cd .. && \
|
||||
echo "Updating $$basename/tools $$basename/public in tarball..." && \
|
||||
tar -rf ../$$tar $$basename/tools $$basename/public && \
|
||||
# remove go.mod and go.sum as we build exclusively using vendor deps \
|
||||
tar -f ../$$tar --delete $$basename/go.mod $$basename/go.sum && \
|
||||
cd .. && \
|
||||
xz $$tar && \
|
||||
gzip $$tar && \
|
||||
rm -rf $$tmpdir
|
||||
|
||||
4
README
4
README
@ -17,7 +17,9 @@ we have a Makefile which does the following:
|
||||
In order for this to work you need to have npm >= 6, < 12, yarn and
|
||||
grunt installed. To get set up, run:
|
||||
|
||||
# zypper in npm10
|
||||
# zypper in npm12
|
||||
# zypper in obs-service-download_files obs-service-go_modules \
|
||||
obs-service-obs_scm
|
||||
# npm install -g yarn
|
||||
# npm install -g grunt-cli
|
||||
|
||||
|
||||
11
_service
11
_service
@ -3,11 +3,18 @@
|
||||
<param name="url">https://github.com/grafana/grafana</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">6.4.3</param>
|
||||
<param name="revision">v6.4.3</param>
|
||||
<param name="versionformat">6.6.2</param>
|
||||
<param name="revision">v6.6.2</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="compression">gz</param>
|
||||
<param name="file">grafana*.tar</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">grafana</param>
|
||||
</service>
|
||||
<service name="go_modules" mode="disabled">
|
||||
<param name="archive">grafana-6.6.2.tar.gz</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/grafana/grafana</param>
|
||||
<param name="changesrevision">3a2bfb7e3809a193125f0dbb8109e95cbf52db3e</param>
|
||||
<param name="changesrevision">3fa63cfc34668781c7f9b3caafe6d9d400b06b7f</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5cb6e8bf9f1080022dc169fa29afbb5876acbc5adba2c4420a8dbf1ef9a2aa4c
|
||||
size 18172892
|
||||
3
grafana-6.6.2.tar.gz
Normal file
3
grafana-6.6.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:52fd5e8bf90b887cf0f151aca1ffebb723fd93e50c023148ee62d765b3cb4a80
|
||||
size 28172363
|
||||
@ -1,3 +1,66 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 06 06:20:34 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.6.2:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 06 06:15:10 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.6.1:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 21:21:34 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.6.0:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 21:08:39 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.5.3:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 20:59:13 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.5.2:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 20:54:08 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.5.1:
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 20:38:10 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.5.0
|
||||
(see installed changelog for the full list of changes)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 20:29:16 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- Update to version 6.4.5:
|
||||
* Create version 6.4.5
|
||||
* CloudWatch: Fix high CPU load (#20579)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 05 20:22:10 UTC 2020 - kastl@b1-systems.de
|
||||
|
||||
- add obs-service-go_modules to download required modules into vendor.tar.gz
|
||||
- adjusted spec file to use vendor.tar.gz
|
||||
- adjusted Makefile to work with new filenames
|
||||
- BuildRequire go1.14
|
||||
- Update to version 6.4.4:
|
||||
* DataLinks: Fix blur issues. #19883, @aocenas
|
||||
* Docker: Makes it possible to parse timezones in the docker image. #20081, @xlson
|
||||
* LDAP: All LDAP servers should be tried even if one of them returns a connection error. #20077, @jongyllen
|
||||
* LDAP: No longer shows incorrectly matching groups based on role in debug page. #20018, @xlson
|
||||
* Singlestat: Fix no data / null value mapping . #19951, @ryantxu
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 03 15:09:41 UTC 2019 - witold.bedyk@suse.com
|
||||
|
||||
|
||||
20
grafana.spec
20
grafana.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package grafana
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,23 +26,24 @@
|
||||
%endif
|
||||
|
||||
Name: grafana
|
||||
Version: 6.4.3
|
||||
Version: 6.6.2
|
||||
Release: 0
|
||||
Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB
|
||||
License: Apache-2.0
|
||||
Group: System/Monitoring
|
||||
URL: http://grafana.org/
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
Source1: %{name}-rpmlintrc
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
Source1: vendor.tar.gz
|
||||
Source2: %{name}-rpmlintrc
|
||||
# Instructions on the build process
|
||||
Source2: README
|
||||
Source3: README
|
||||
# Makefile to automate build process
|
||||
Source3: Makefile
|
||||
Source4: Makefile
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: go >= 1.11
|
||||
BuildRequires: git-core
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: shadow
|
||||
Requires(post): %insserv_prereq
|
||||
BuildRequires: ( go >= 1.14 with go < 1.15 )
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
@ -54,6 +55,7 @@ dashboards and data with teams.
|
||||
|
||||
%prep
|
||||
%setup -q -n grafana-%{version}
|
||||
%setup -q -T -D -a 1 -n grafana-%{version}
|
||||
|
||||
%build
|
||||
%goprep github.com/grafana/grafana
|
||||
@ -64,7 +66,7 @@ dashboards and data with teams.
|
||||
# (The %%gobuild macro can't take quoted strings; they get split up when
|
||||
# expanded to $extra_flags in process_build() in /usr/lib/rpm/golang.sh.)
|
||||
export IMPORTPATH="github.com/grafana/grafana"
|
||||
export BUILDFLAGS="-v -p 4 -x -buildmode=pie"
|
||||
export BUILDFLAGS="-v -p 4 -x -buildmode=pie -mod=vendor"
|
||||
export GOPATH=%{_builddir}/go:%{_builddir}/contrib
|
||||
export GOBIN=%{_builddir}/go/bin
|
||||
go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd/...
|
||||
|
||||
3
vendor.tar.gz
Normal file
3
vendor.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dbd468bb4eeb2f73a24fe7e4b8ad616bb0fa7adcc5c1ebe237069350519a554c
|
||||
size 8411258
|
||||
Loading…
Reference in New Issue
Block a user