Skip to content

Commit 55f2495

Browse files
committed
build: publishes armv6 to grafana.com.
Stops using the old publisher completely. Closes grafana#13008
1 parent 2dc2471 commit 55f2495

File tree

3 files changed

+11
-199
lines changed

3 files changed

+11
-199
lines changed

.circleci/config.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ jobs:
147147
- run:
148148
name: sha-sum packages
149149
command: 'go run build.go sha-dist'
150-
- run:
151-
name: Build Grafana.com master publisher
152-
command: 'go build -o scripts/publish scripts/build/publish.go'
153150
- run:
154151
name: Test and build Grafana.com release publisher
155152
command: 'cd scripts/build/release_publisher && go test . && go build -o release_publisher .'
@@ -158,7 +155,6 @@ jobs:
158155
paths:
159156
- dist/grafana*
160157
- scripts/*.sh
161-
- scripts/publish
162158
- scripts/build/release_publisher/release_publisher
163159
- scripts/build/publish.sh
164160

@@ -393,7 +389,7 @@ jobs:
393389
name: Publish to Grafana.com
394390
command: |
395391
rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
396-
./scripts/publish -apiKey ${GRAFANA_COM_API_KEY}
392+
cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -from-local
397393
398394
deploy-release:
399395
docker:

scripts/build/publish.go

-194
This file was deleted.

scripts/build/release_publisher/publisher.go

+10
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,21 @@ var completeBuildArtifactConfigurations = []buildArtifact{
127127
arch: "armv7",
128128
urlPostfix: "_armhf.deb",
129129
},
130+
{
131+
os: "deb",
132+
arch: "armv6",
133+
urlPostfix: "_armel.deb",
134+
},
130135
{
131136
os: "rhel",
132137
arch: "armv7",
133138
urlPostfix: ".armhfp.rpm",
134139
},
140+
{
141+
os: "linux",
142+
arch: "armv6",
143+
urlPostfix: ".linux-armv6.tar.gz",
144+
},
135145
{
136146
os: "linux",
137147
arch: "armv7",

0 commit comments

Comments
 (0)