Add all architectures to bintray

nextdns · Nov 21, 2019 · 84f8ca0 · 84f8ca0
1 parent 40eea6b
commit 84f8ca0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/.bintray b/.bintray
@@ -3,26 +3,23 @@
 version=$(git tag --points-at HEAD | sed -e 's/^v//')
 bintray_curl="curl -unextdns:$API_KEY"
 package=./dist/nextdns_${version}_linux
+deb_repourl="https://api.bintray.com/content/nextdns/deb/nextdns/${version}"
+rpm_repourl="https://api.bintray.com/content/nextdns/rpm/nextdns/${version}"
 
-# Deb
-repourl="https://api.bintray.com/content/nextdns/deb/nextdns/${version}"
-echo "Uploading ${package}_amd64.deb"
-$bintray_curl -T ${package}_amd64.deb "${repourl}/pool/main/m/nextdns_${version}_arm64.deb;deb_distribution=stable;deb_component=main;deb_architecture=amd64"
-echo "Uploading ${package}_386.deb"
-$bintray_curl -T ${package}_386.deb "${repourl}/pool/main/m/nextdns_${version}_i386.deb;deb_distribution=stable;deb_component=main;deb_architecture=i386"
+for arch in i386 amd64 armv5 armv6 arvm7 mips mips64 mips64le; do
+    # Deb
+    echo "Uploading ${package}_${arch}.deb"
+    $bintray_curl -T ${package}_${arch}.deb "${deb_repourl}/pool/main/m/nextdns_${version}_${arch}.deb;deb_distribution=stable;deb_component=main;deb_architecture=${arch}"
+
+    # RPM
+    echo "Uploading ${package}_${arch}.rpm"
+    $bintray_curl -T ${package}_${arch}.rpm "${rpm_repourl}/nextdns_${version}_${arch}.rpm"
+done
 
 echo "Signing and pubishing"
 $bintray_curl -X POST https://api.bintray.com/calc_metadata/nextdns/deb/
-$bintray_curl -X POST "$repourl/publish"
-
-# RPM
-repourl="https://api.bintray.com/content/nextdns/rpm/nextdns/${version}"
-echo "Uploading ${package}_amd64.rpm"
-$bintray_curl -T ${package}_amd64.rpm "${repourl}/nextdns_${version}_amd64.rpm"
-echo "Uploading ${package}_386.rpm"
-$bintray_curl -T ${package}_386.rpm "${repourl}/nextdns_${version}_i386.rpm"
+$bintray_curl -X POST "$deb_repourl/publish"
 
 echo "Signing and pubishing"
 $bintray_curl -X POST https://api.bintray.com/calc_metadata/nextdns/rpm/
-$bintray_curl -X POST "$repourl/publish"
-
+$bintray_curl -X POST "$rpm_repourl/publish"
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -8,6 +8,7 @@ builds:
   - linux
   - darwin
   goarch:
+  - 386
   - amd64
   - arm
   - arm64
@@ -26,6 +27,8 @@ archives:
   files:
   - LICENSE
   - README.md
+  replacements:
+    386: i386
 checksum:
   name_template: 'checksums.txt'
 release:

diff --git a/go.sum b/go.sum
@@ -24,7 +24,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191105084925-a882066a44e0 h1:QPlSTtPE2k6PZPasQUbzuK3p9JbS+vMXYVto8g/yrsg=
 golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191116160921-f9c825593386 h1:ktbWvQrW08Txdxno1PiDpSxPXG6ndGsfnJjRRtkM0LQ=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 h1:FDfvYgoVsA7TTZSbgiqjAbfPbK47CNHdWl3h/PJtii0=