Bump version

Use zip for windows releases
Goodbye perl build script.
2024-04-30 22:22:13 +09:30 · 2022-12-05 23:44:06 +10:30 · 2022-12-05 23:36:16 +10:30 · 2022-12-05 23:24:27 +10:30
10 changed files with 157 additions and 145 deletions
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -0,0 +1,45 @@
+before:
+  hooks:
+    # clean up/install modules
+    - go mod tidy
+    - "go run tools/windows_metadata/release.go v{{- .Version }}"
+builds:
+  - main: 
+    hooks:
+      pre:
+      - "rm -f resource.syso"
+      - "go generate"
+    ignore:
+    - goos: windows
+      goarch: arm64
+    ldflags:
+      - '{{ if eq .Os "windows" }}-H=windowsgui{{ end }}'
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+archives:
+  - replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+    format_overrides:
+      - goos: windows
+        format: zip
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ incpatch .Version }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^Merge:'
+      - '^docs:'
+      - '^test:'
+      - '^[Bb]ump'
+      - '^[Cc]lean'
--- a/build-release.pl
+++ b/build-release.pl
@ -1,81 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-use Mojo::JSON qw/encode_json decode_json/;
-use Mojo::File;
-
-open my $fh, "<", "version/version.go" || die $!;
-
-my $version;
-while (<$fh>) {
-  $version = $1 if /^const\s+CurrentVersion.*?"v([\d\.]+)"/;
-}
-close $fh;
-die "no version?" unless defined $version;
-
-my @version_parts = split /\./, $version;
-die "bad version?" unless defined $version_parts[2];
-
-foreach (@version_parts) {
-  $_ = 0 + $_;
-}
-
-$version = "v$version";
-
-# quit if tests fail
-system("go test ./...") && die "not building release with failing tests";
-
-# so lazy
-system "rm", "-rf", "release", "dist";
-system "mkdir", "release";
-system "mkdir", "dist";
-
-my %build = (
-  win   => { env => { GOOS => 'windows', GOARCH => 'amd64' }, filename => 'dau.exe' },
-  linux_amd64 => { env => { GOOS => 'linux',   GOARCH => 'amd64' }, filename => 'dau' },
-  linux_arm64 => { env => { GOOS => 'linux',   GOARCH => 'arm64' }, filename => 'dau' },
-  mac_amd64   => { env => { GOOS => 'darwin',  GOARCH => 'amd64' }, filename => 'dau' },
-  mac_arm64   => { env => { GOOS => 'darwin',  GOARCH => 'arm64' }, filename => 'dau' },
-); 
-
-foreach my $type (keys %build) {
-  mkdir "release/$type";
-}
-
-add_extras();
-
-foreach my $type (keys %build) {
-  print "building for $type\n";
-  local $ENV{GOOS}   = $build{$type}->{env}->{GOOS};
-  local $ENV{GOARCH} = $build{$type}->{env}->{GOARCH};
-
-  unlink "resource.syso";
-
-  my @ldflags = ();
-  if ($type eq "win") {
-    # create the versioninfo.json based on the current version
-    my $tmp = Mojo::File->new("versioninfo.json-template")->slurp();
-    my $vdata = decode_json($tmp);
-    $vdata->{FixedFileInfo}->{FileVersion}->{Major} = $version_parts[0] ;
-    $vdata->{FixedFileInfo}->{FileVersion}->{Minor} = $version_parts[1] ;
-    $vdata->{FixedFileInfo}->{FileVersion}->{Patch} = $version_parts[2] ;
-    $vdata->{FixedFileInfo}->{ProductVersion}->{Major} = $version_parts[0] ;
-    $vdata->{FixedFileInfo}->{ProductVersion}->{Minor} = $version_parts[1] ;
-    $vdata->{FixedFileInfo}->{ProductVersion}->{Patch} = $version_parts[2] ;
-
-    $vdata->{StringFileInfo}->{ProductVersion} = $version;
-
-    Mojo::File->new("versioninfo.json")->spurt(encode_json($vdata));
-
-    @ldflags = (qw/ -ldflags -H=windowsgui/);
-    system "go", "generate";
-  }
-  warn join(' ', "go", "build", @ldflags, "-o", "release/$type/" . $build{$type}->{filename});
-  system "go", "build", @ldflags, "-o", "release/$type/" . $build{$type}->{filename};
-  system "zip", "-j", "dist/dau-$type-$version.zip", ( glob "release/$type/*" );
-}
-
-sub add_extras {
-  # we used to have a .bat file here, but no longer needed
-}
--- a/dau_nonwindows.go
+++ b/dau_nonwindows.go
@ -1,4 +1,5 @@
-//go:build !windows
+//go:build darwin || linux
+// +build darwin linux

 package main

--- a/dau_windows.go
+++ b/dau_windows.go
@ -10,12 +10,10 @@ import (
 	"github.com/tardisx/discord-auto-upload/version"
 )

-//go:embed dau.ico
-var appIcon []byte
-
 //go:generate goversioninfo

-// -manifest=testdata/resource/goversioninfo.exe.manifest
+//go:embed dau.ico
+var appIcon []byte

 func mainloop(c *config.ConfigService) {
 	systray.Run(func() { onReady(c) }, onExit)
--- a/go.mod
+++ b/go.mod
@ -7,9 +7,9 @@ require (
 	github.com/getlantern/systray v1.2.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/gorilla/mux v1.8.0
-	github.com/josephspurrier/goversioninfo v1.4.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
+	github.com/stretchr/testify v1.6.1 // indirect
 	golang.org/x/image v0.0.0-20210504121937-7319ad40d33e
-	golang.org/x/mod v0.4.2
+	golang.org/x/mod v0.7.0
 )
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,3 @@
-github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
-github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
@ -24,8 +22,6 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8=
-github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
@ -35,26 +31,38 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/image v0.0.0-20210504121937-7319ad40d33e h1:PzJMNfFQx+QO9hrC1GwZ4BoPGeNGhfeQEgcQFArEjPk=
 golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/tools/windows_metadata/release.go
+++ b/tools/windows_metadata/release.go
@ -0,0 +1,84 @@
+package main
+
+import (
+	"log"
+	"os"
+	"regexp"
+	"strings"
+
+	"golang.org/x/mod/semver"
+)
+
+const versionInfoTemplate = `
+{
+    "FixedFileInfo": {
+        "FileVersion": {
+            "Major": MAJOR,
+            "Minor": MINOR,
+            "Patch": PATCH,
+            "Build": 0
+        },
+        "ProductVersion": {
+            "Major": MAJOR,
+            "Minor": MINOR,
+            "Patch": PATCH,
+            "Build": 0
+        },
+        "FileFlagsMask": "3f",
+        "FileFlags ": "00",
+        "FileOS": "040004",
+        "FileType": "01",
+        "FileSubType": "00"
+    },
+    "StringFileInfo": {
+        "Comments": "",
+        "CompanyName": "tardisx@github",
+        "FileDescription": "https://github.com/tardisx/discord-auto-upload",
+        "FileVersion": "",
+        "InternalName": "",
+        "LegalCopyright": "https://github.com/tardisx/discord-auto-upload/blob/master/LICENSE",
+        "LegalTrademarks": "",
+        "OriginalFilename": "",
+        "PrivateBuild": "",
+        "ProductName": "discord-auto-upload",
+        "ProductVersion": "VERSION",
+        "SpecialBuild": ""
+    },
+    "VarFileInfo": {
+        "Translation": {
+            "LangID": "0409",
+            "CharsetID": "04B0"
+        }
+    },
+    "IconPath": "dau.ico",
+    "ManifestPath": ""
+}
+`
+
+var nonAlphanumericRegex = regexp.MustCompile(`[^0-9]+`)
+
+func main() {
+	version := os.Args[1]
+	if !semver.IsValid(version) {
+		panic("bad version" + version)
+	}
+	parts := strings.Split(version, ".")
+	if len(parts) < 3 {
+		log.Fatalf("bad version: %s", version)
+	}
+
+	parts[0] = nonAlphanumericRegex.ReplaceAllString(parts[0], "")
+	parts[1] = nonAlphanumericRegex.ReplaceAllString(parts[1], "")
+	parts[2] = nonAlphanumericRegex.ReplaceAllString(parts[2], "")
+
+	out := versionInfoTemplate
+	out = strings.Replace(out, "MAJOR", parts[0], -1)
+	out = strings.Replace(out, "MINOR", parts[1], -1)
+	out = strings.Replace(out, "PATCH", parts[2], -1)
+	out = strings.Replace(out, "VERSION", version, -1)
+
+	f, _ := os.Create("versioninfo.json")
+	f.Write([]byte(out))
+	f.Close()
+
+}
--- a/version/version.go
+++ b/version/version.go
@ -13,7 +13,7 @@ import (
 	"golang.org/x/mod/semver"
 )

-const CurrentVersion string = "v0.13.0-alpha.1"
+const CurrentVersion string = "v0.13.0"

 type GithubRelease struct {
 	HTMLURL string `json:"html_url"`
--- a/version/version_test.go
+++ b/version/version_test.go
@ -13,7 +13,7 @@ func TestVersioningUpdate(t *testing.T) {
 }

 func TestVersioningNoUpdate(t *testing.T) {
-	// pretend there is a new version
+	// pretend there is not a new version
 	LatestVersion = "v0.12.1"
 	if UpdateAvailable() {
 		t.Error("should NOT be a version newer than " + CurrentVersion)
--- a/versioninfo.json-template
+++ b/versioninfo.json-template
@ -1,43 +0,0 @@
-{
-    "FixedFileInfo": {
-        "FileVersion": {
-            "Major": 0,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "ProductVersion": {
-            "Major": 0,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "FileFlagsMask": "3f",
-        "FileFlags ": "00",
-        "FileOS": "040004",
-        "FileType": "01",
-        "FileSubType": "00"
-    },
-    "StringFileInfo": {
-        "Comments": "",
-        "CompanyName": "tardisx@github",
-        "FileDescription": "https://github.com/tardisx/discord-auto-upload",
-        "FileVersion": "",
-        "InternalName": "",
-        "LegalCopyright": "https://github.com/tardisx/discord-auto-upload/blob/master/LICENSE",
-        "LegalTrademarks": "",
-        "OriginalFilename": "",
-        "PrivateBuild": "",
-        "ProductName": "discord-auto-upload",
-        "ProductVersion": "v0.0.0",
-        "SpecialBuild": ""
-    },
-    "VarFileInfo": {
-        "Translation": {
-            "LangID": "0409",
-            "CharsetID": "04B0"
-        }
-    },
-    "IconPath": "dau.ico",
-    "ManifestPath": ""
-}
Author	SHA1	Message	Date
Justin Hawkins	76dbbacd98	Bump version	2024-04-30 22:22:13 +09:30
Justin Hawkins	ba31f52ee2	Use zip for windows releases	2022-12-05 23:44:06 +10:30
Justin Hawkins	779f9e1992	Goodbye perl build script.	2022-12-05 23:36:16 +10:30
Justin Hawkins	553337bfab	Migrate to goreleaser for next version	2022-12-05 23:24:27 +10:30