From e4374b1d56399cfc404ef9cd59e025d5f1962ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:33:03 -0400 Subject: [PATCH 1/3] docs(): updated download links --- build.go | 2 +- docs/sources/installation/debian.md | 6 +++--- docs/sources/installation/rpm.md | 8 ++++---- packaging/publish/publish.sh | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.go b/build.go index 93b9e6db087..a28e8870252 100644 --- a/build.go +++ b/build.go @@ -73,7 +73,7 @@ func main() { grunt("test") case "package": - grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) + // grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) createLinuxPackages() case "pkg-rpm": diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 3b720643d1a..8fa0d2cc1c3 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, debian, ubuntu, guide Description | Download ------------ | ------------- Stable .deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb) -Beta .deb for Debian-based Linux | [grafana_3.0.0-beta31460467884_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta31460467884_amd64.deb) +Beta .deb for Debian-based Linux | [grafana_3.0.0-beta41460581169_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb) ## Install Stable @@ -21,9 +21,9 @@ Beta .deb for Debian-based Linux | [grafana_3.0.0-beta31460467884_amd64.deb](h ## Install 3.0 Beta - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta31460467884_amd64.deb + $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta41460581169_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.0.0-beta31460467884_amd64.deb + $ sudo dpkg -i grafana_3.0.0-beta41460581169_amd64.deb ## APT Repository diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 4b2d5467812..adbaa055f29 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -11,7 +11,7 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide Description | Download ------------ | ------------- Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm) -Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta31460467884.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta31460467884§.x86_64.rpm) +Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta41460581169.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169§.x86_64.rpm) ## Install Stable Release from package file @@ -34,18 +34,18 @@ Or install manually using `rpm`. You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta41460581169.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo rpm -Uvh grafana-3.0.0-beta41460581169.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.0.0-beta31460467884.x86_64.rpm + $ sudo rpm -i --nodeps grafana-3.0.0-beta41460581169.x86_64.rpm ## Install via YUM Repository diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh index 4ab6b2f6b45..dd0c935d2cd 100755 --- a/packaging/publish/publish.sh +++ b/packaging/publish/publish.sh @@ -1,16 +1,16 @@ #! /usr/bin/env bash -deb_ver=3.0.0-beta31460467884 -rpm_ver=3.0.0-beta31460467884 +deb_ver=3.0.0-beta41460581169 +rpm_ver=3.0.0-beta41460581169 #rpm_ver=3.0.0-1 -# wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb +wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb -# package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb +package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm From 5c395424c631afe621a8954686fea446500fbe8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:42:33 -0400 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86103f8e8c3..2ccae3cf6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 3.0.0-beta4 (unreleased) +# 3.0.0-beta4 (2016-04-13) ### Bug fixes * **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) From 573457c03fb26b5dc3aecc80ac98003b6f205ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 17:48:20 -0400 Subject: [PATCH 3/3] fix(build): fixed build script issue --- build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.go b/build.go index a28e8870252..93b9e6db087 100644 --- a/build.go +++ b/build.go @@ -73,7 +73,7 @@ func main() { grunt("test") case "package": - // grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) + grunt("release", fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration)) createLinuxPackages() case "pkg-rpm":