Do not use deprecated gorelease key + whitespace changes

maxmind · Jun 7, 2019 · d7154e8 · d7154e8
1 parent 3559899
commit d7154e8
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 62 deletions.
diff --git a/.goreleaser-packages.yml b/.goreleaser-packages.yml
@@ -1,26 +1,27 @@
 project_name: 'geoipupdate'
-archive:
-  wrap_in_directory: true
-  files:
-    - 'CHANGELOG.md'
-    - 'LICENSE-APACHE'
-    - 'LICENSE-MIT'
-    - 'README.md'
-    - 'GeoIP.conf'
-    - 'GeoIP.conf.md'
-    - 'geoipupdate.md'
+archives:
+  - id: main
+    wrap_in_directory: true
+    files:
+      - 'CHANGELOG.md'
+      - 'LICENSE-APACHE'
+      - 'LICENSE-MIT'
+      - 'README.md'
+      - 'GeoIP.conf'
+      - 'GeoIP.conf.md'
+      - 'geoipupdate.md'
 builds:
-- main: './cmd/geoipupdate'
-  binary: 'geoipupdate'
-  goarch:
-    - '386'
-    - 'amd64'
-  goos:
-    - 'linux'
-  hooks:
-    post: 'make data BUILDDIR=. CONFFILE=/etc/GeoIP.conf DATADIR=/usr/share/GeoIP'
-  ldflags:
-   - '-s -w -X main.version={{.Version}} -X main.defaultConfigFile=/etc/GeoIP.conf -X main.defaultDatabaseDirectory=/usr/share/GeoIP'
+  - main: './cmd/geoipupdate'
+    binary: 'geoipupdate'
+    goarch:
+      - '386'
+      - 'amd64'
+    goos:
+      - 'linux'
+    hooks:
+      post: 'make data BUILDDIR=. CONFFILE=/etc/GeoIP.conf DATADIR=/usr/share/GeoIP'
+    ldflags:
+      - '-s -w -X main.version={{.Version}} -X main.defaultConfigFile=/etc/GeoIP.conf -X main.defaultDatabaseDirectory=/usr/share/GeoIP'
 checksum:
   name_template: 'checksums-dpkg-rpm.txt'
 nfpm:
@@ -34,7 +35,7 @@ nfpm:
     - rpm
   bindir: /usr/bin
   empty_folders:
-  - /usr/share/GeoIP
+    - /usr/share/GeoIP
   files:
     'CHANGELOG.md': '/usr/share/doc/geoipupdate/CHANGELOG.md'
     'LICENSE-APACHE': '/usr/share/doc/geoipupdate/LICENSE-APACHE'

diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml
@@ -1,25 +1,26 @@
 project_name: 'geoipupdate'
-archive:
-  wrap_in_directory: true
-  files:
-    - 'CHANGELOG.md'
-    - 'LICENSE-APACHE'
-    - 'LICENSE-MIT'
-    - 'README.md'
-    - 'GeoIP.conf'
-    - 'GeoIP.conf.md'
-    - 'geoipupdate.md'
-  format: zip
+archives:
+  - id: main
+    wrap_in_directory: true
+    files:
+      - 'CHANGELOG.md'
+      - 'LICENSE-APACHE'
+      - 'LICENSE-MIT'
+      - 'README.md'
+      - 'GeoIP.conf'
+      - 'GeoIP.conf.md'
+      - 'geoipupdate.md'
+    format: zip
 builds:
-- main: './cmd/geoipupdate'
-  binary: 'geoipupdate'
-  goarch:
-    - '386'
-    - 'amd64'
-  goos:
-    - 'windows'
-  hooks:
-    post: 'make data OS=Windows_NT BUILDDIR=.'
+  - main: './cmd/geoipupdate'
+    binary: 'geoipupdate'
+    goarch:
+      - '386'
+      - 'amd64'
+    goos:
+      - 'windows'
+    hooks:
+      post: 'make data OS=Windows_NT BUILDDIR=.'
 checksum:
   name_template: 'checksums-windows.txt'
 release:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,24 +1,25 @@
 project_name: 'geoipupdate'
-archive:
-  wrap_in_directory: true
-  files:
-    - 'CHANGELOG.md'
-    - 'LICENSE-APACHE'
-    - 'LICENSE-MIT'
-    - 'README.md'
-    - 'GeoIP.conf'
-    - 'GeoIP.conf.md'
-    - 'geoipupdate.md'
+archives:
+  - id: main
+    wrap_in_directory: true
+    files:
+      - 'CHANGELOG.md'
+      - 'LICENSE-APACHE'
+      - 'LICENSE-MIT'
+      - 'README.md'
+      - 'GeoIP.conf'
+      - 'GeoIP.conf.md'
+      - 'geoipupdate.md'
 builds:
-- main: './cmd/geoipupdate'
-  binary: 'geoipupdate'
-  goarch:
-    - '386'
-    - 'amd64'
-  goos:
-    - 'darwin'
-    - 'linux'
-  hooks:
-    post: 'make data BUILDDIR=.'
+  - main: './cmd/geoipupdate'
+    binary: 'geoipupdate'
+    goarch:
+      - '386'
+      - 'amd64'
+    goos:
+      - 'darwin'
+      - 'linux'
+    hooks:
+      post: 'make data BUILDDIR=.'
 checksum:
   name_template: 'checksums-darwin-linux.txt'