Only build on push, not release

.drone.yml

@@ -3,27 +3,20 @@ name: default
 
 steps:
   - name: build
-    image: golang:latest
+    image: tystuyfzand/goc
     group: build
     volumes:
       - name: build
         path: /build
     commands:
-     - mkdir -p /build/i386 /build/amd64 /build/armv7 /build/arm64
+     - GOOS=linux,windows GOARCH=386,arm,arm64,amd64 goc -o /build/owapi
-     - GOOS=linux GOARCH=386 go build -o /build/i386/owapi_i386
-     - go build -o /build/amd64/owapi_amd64
-     - GOOS=linux GOARCH=arm GOARM=7 go build -o /build/armv7/owapi_armv7
-     - GOOS=linux GOARCH=arm64 go build -o /build/arm64/owapi_arm64
   - name: package
     image: tystuyfzand/fpm
     commands:
      - export VERSION=`grep "Version" main.go | head -n 1 | awk '{print $3}' | sed -e 's/^"//' -e 's/"$//' | tr -d '\n'`
      - echo "v$VERSION" > /build/version.txt
-     - chmod +x packaging/build-package.sh packaging/package-upload.sh
+     - chmod +x packaging/build-package.sh
-     - ARCH=i386 packaging/build-package.sh
+     - ARCH=386,amd64,arm,arm64 packaging/build-package.sh
-     - ARCH=amd64 packaging/build-package.sh
-     - ARCH=armv7 packaging/build-package.sh
-     - ARCH=arm64 packaging/build-package.sh
     volumes:
       - name: build
         path: /build
@@ -39,7 +32,7 @@ steps:
       gitea_server: https://git.meow.tf
       tag_file: /build/version.txt
       title_file: /build/version.txt
-      files: [ '/build/*/owapi_*' ]
+      files: [ '/build/owapi_*' ]
     environment:
       PLUGIN_API_KEY:
         from_secret: gitea_token
@@ -54,18 +47,12 @@ steps:
       registry: registry.meow.tf
       tags:
         - latest
-  - name: repo
-    image: tystuyfzand/drone-deb-simple
-    volumes:
-      - name: build
-        path: /build
-    settings:
-      url:
-        from_secret: upload_url
-      key:
-        from_secret: upload_key
-      distro: stable
-      files: [ '/build/*/owapi_*.deb' ]
 volumes:
   - name: build
-    temp: {}
+    temp: {}
+
+trigger:
+  branch:
+    - master
+  event:
+    - push

go.mod

@@ -3,7 +3,7 @@ module git.meow.tf/ow-api/ow-api
 go 1.12
 
 require (
-	github.com/PuerkitoBio/goquery v1.5.1
+	github.com/PuerkitoBio/goquery v1.6.1
 	github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/go-redis/redis v6.15.6+incompatible
@@ -13,5 +13,5 @@ require (
 	github.com/stoewer/go-strcase v1.2.0
 	github.com/stretchr/objx v0.2.0 // indirect
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	s32x.com/ovrstat v0.0.0-20201019064501-7679355452e1
+	s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8
 )

go.sum

@@ -2,6 +2,8 @@ github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f h1:cWOyRTtBc
 github.com/PuerkitoBio/goquery v1.5.1-0.20190109230704-3dcf72e6c17f/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/goquery v1.6.1 h1:FgjbQZKl5HTmcn4sKBgvx8vv63nhyhIpv7lJpFGCWpk=
+github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
@@ -37,6 +39,8 @@ github.com/labstack/echo/v4 v4.1.14 h1:h8XP66UfB3tUm+L3QPw7tmwAu3pJaA/nyfHPCcz46
 github.com/labstack/echo/v4 v4.1.14/go.mod h1:Q5KZ1vD3V5FEzjM79hjwVrC3ABr7F5IdM23bXQMRDGg=
 github.com/labstack/echo/v4 v4.1.17 h1:PQIBaRplyRy3OjwILGkPg89JRtH2x5bssi59G2EL3fo=
 github.com/labstack/echo/v4 v4.1.17/go.mod h1:Tn2yRQL/UclUalpb5rPdXDevbkJ+lp/2svdyFBg6CHQ=
+github.com/labstack/echo/v4 v4.2.0 h1:jkCSsjXmBmapVXF6U4BrSz/cgofWM0CU3Q74wQvXkIc=
+github.com/labstack/echo/v4 v4.2.0/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/gommon v0.2.9 h1:heVeuAYtevIQVYkGj6A41dtfT91LrvFG220lavpWhrU=
 github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
@@ -144,6 +148,8 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -167,3 +173,5 @@ s32x.com/ovrstat v0.0.0-20200131231416-4cb42edd331d/go.mod h1:UzsLSEoY8B4FByz4e+
 s32x.com/ovrstat v0.0.0-20201003203341-5f1ad8502a8f/go.mod h1:UzsLSEoY8B4FByz4e+5GGKebJio+H+axo3RxLr7d7Mw=
 s32x.com/ovrstat v0.0.0-20201019064501-7679355452e1 h1:Ppeg8R00VA9EJ8n3owtEwy21vdGJPq/wJ7wLK0tElQA=
 s32x.com/ovrstat v0.0.0-20201019064501-7679355452e1/go.mod h1:M1e9y2Q2vUOaHRxB4l+vx3Dyje4HbaSls7L+dQ0PsEE=
+s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8 h1:UwvCWPAjUnC+BE2jlbozuYiiSfrJA5BtlkNdaMWUao0=
+s32x.com/ovrstat v0.0.0-20210411215317-b668284adcc8/go.mod h1:UJrvRJ1Rb0u6Croris6ZQQNQia+Yhu7JIM63uRyLOuc=

main.go

@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	Version = "2.4.4"
+	Version = "2.4.7"
 
 	OpAdd    = "add"
 	OpRemove = "remove"

packaging/build-package.sh

@@ -1,10 +1,12 @@
-fpm -s dir -t deb -p /build/$ARCH/owapi_${VERSION}_${ARCH}.deb \
+for arch in $(echo $ARCH | sed "s/,/ /g"); do
-    -n ow-api -v $VERSION -a $ARCH \
+  fpm -s dir -t deb -p /build/owapi_${VERSION}_${arch}.deb \
-    --deb-priority optional --force \
+      -n ow-api -v $VERSION -a $arch \
-    --deb-compression bzip2 \
+      --deb-priority optional --force \
-    --description "Overwatch API Server" \
+      --deb-compression gz \
-    -m "Tyler Stuyfzand <admin@meow.tf>" --vendor "Meow.tf" \
+      --description "Overwatch API Server" \
-    --before-install packaging/scripts/preinst.deb \
+      -m "Tyler Stuyfzand <admin@meow.tf>" --vendor "Meow.tf" \
-    --after-install packaging/scripts/postinst.deb \
+      --before-install packaging/scripts/preinst.deb \
-    -a $ARCH /build/$ARCH/owapi_${ARCH}=/usr/bin/owapi \
+      --after-install packaging/scripts/postinst.deb \
-    packaging/owapi.service=/lib/systemd/system/owapi.service
+      /build/owapi_linux_${arch}=/usr/bin/owapi \
+      packaging/owapi.service=/lib/systemd/system/owapi.service
+done