Przeglądaj źródła

build: minor publisher fixes.

Leonard Gram 7 lat temu
rodzic
commit
272c43f7b7

+ 1 - 1
.circleci/config.yml

@@ -337,7 +337,7 @@ jobs:
           command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/master'
       - run:
           name: Deploy to grafana.com
-          command: 'cd enterprise-dist && scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -from-local'
+          command: 'cd enterprise-dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -from-local'
 
 
   deploy-enterprise-release:

+ 1 - 1
scripts/build/release_publisher/externalrelease.go

@@ -29,7 +29,7 @@ func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl
 
 	r := release{
 		Version:         version,
-		ReleaseDate:     time.Now(),
+		ReleaseDate:     time.Now().UTC(),
 		Stable:          !isBeta,
 		Beta:            isBeta,
 		Nightly:         false,

+ 1 - 1
scripts/build/release_publisher/localrelease.go

@@ -22,7 +22,7 @@ func (r releaseLocalSources) prepareRelease(baseArchiveUrl, whatsNewUrl string,
 
 	rel := release{
 		Version:         buildData.version,
-		ReleaseDate:     time.Now(),
+		ReleaseDate:     time.Now().UTC(),
 		Stable:          false,
 		Beta:            false,
 		Nightly:         true,

+ 1 - 1
scripts/build/release_publisher/publisher_test.go

@@ -58,7 +58,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) {
 	expectedBuilds := 4
 
 	var builder releaseBuilder
-	testDataPath := "local_test_data"
+	testDataPath := "testdata"
 	builder = releaseLocalSources{
 		path:                   testDataPath,
 		artifactConfigurations: buildArtifactConfigurations,

+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz.sha256 → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.linux-amd64.tar.gz.sha256


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.windows-amd64.zip → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.zip


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.windows-amd64.zip.sha256 → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.zip.sha256


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.x86_64.rpm → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.x86_64.rpm


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise-5.4.0-123pre1.x86_64.rpm.sha256 → scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.x86_64.rpm.sha256


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise_5.4.0-123pre1_amd64.deb → scripts/build/release_publisher/testdata/grafana-enterprise_5.4.0-123pre1_amd64.deb


+ 0 - 0
scripts/build/release_publisher/local_test_data/grafana-enterprise_5.4.0-123pre1_amd64.deb.sha256 → scripts/build/release_publisher/testdata/grafana-enterprise_5.4.0-123pre1_amd64.deb.sha256