From e154d05c10f63ad3a08d1544055c213f313e8154 Mon Sep 17 00:00:00 2001
From: Will McCutchen <will@mccutch.org>
Date: Thu, 31 Mar 2022 11:23:04 -0400
Subject: [PATCH] Misc build & CI fixes (#76)
* Fix installation of deps
* Rebuild static assets w/ newest go-bindata
* Update go versions for CI
* Fix deploy on merge
* Bump golangci-lint version
---
.github/workflows/continuous_delivery.yaml | 12 ++++++------
.github/workflows/lint.yaml | 4 ++--
Makefile | 8 ++++----
httpbin/assets/assets.go | 20 ++++++++++----------
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/continuous_delivery.yaml b/.github/workflows/continuous_delivery.yaml
index e554dce..2f70da5 100644
--- a/.github/workflows/continuous_delivery.yaml
+++ b/.github/workflows/continuous_delivery.yaml
@@ -21,7 +21,7 @@ jobs:
- name: Setup
uses: actions/setup-go@v2
with:
- go-version: '1.17'
+ go-version: '1.18'
- name: Checkout
uses: actions/checkout@v2
@@ -46,8 +46,7 @@ jobs:
strategy:
matrix:
go_version:
- - '1.14'
- - '1.15'
+ - '1.17'
- '1.16'
steps:
@@ -74,6 +73,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
+ - name: Setup flyctl
+ uses: superfly/flyctl-actions/setup-flyctl@1.3
+
- name: Notify start
id: deployment
uses: bobheadxi/deployments@v0.6.1
@@ -83,9 +85,7 @@ jobs:
env: production
- name: Deploy
- uses: superfly/flyctl-actions@1.1
- with:
- args: "deploy --strategy rolling"
+ run: "flyctl deploy --strategy rolling"
env:
DOCKER_BUILDKIT: 1
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index adad750..264f3ac 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,6 +13,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: golangci-lint
- uses: golangci/golangci-lint-action@v2
+ uses: golangci/golangci-lint-action@v3.1.0
with:
- version: v1.39.0
+ version: v1.45.2
diff --git a/Makefile b/Makefile
index 8b5df95..ab036c0 100644
--- a/Makefile
+++ b/Makefile
@@ -157,13 +157,13 @@ imagepush:
# Deps are installed outside of working dir to avoid polluting go modules
# =============================================================================
$(TOOL_GOBINDATA):
- cd /tmp && go get -u github.com/kevinburke/go-bindata/...
+ go install github.com/kevinburke/go-bindata/go-bindata@v3.23.0
$(TOOL_GOLINT):
- cd /tmp && go get -u golang.org/x/lint/golint
+ go install golang.org/x/lint/golint@latest
$(TOOL_REFLEX):
- cd /tmp && go get -u github.com/cespare/reflex
+ go install github.com/cespare/reflex@0.3.1
$(TOOL_STATICCHECK):
- cd /tmp && go get -u honnef.co/go/tools/cmd/staticcheck
+ go install honnef.co/go/tools/cmd/staticcheck@v0.3.0
diff --git a/httpbin/assets/assets.go b/httpbin/assets/assets.go
index 2db789b..bb4b17a 100644
--- a/httpbin/assets/assets.go
+++ b/httpbin/assets/assets.go
@@ -1,15 +1,15 @@
// Code generated by go-bindata. DO NOT EDIT.
// sources:
-// static/forms-post.html (1.398kB)
-// static/image.jpeg (35.588kB)
-// static/image.png (8.09kB)
-// static/image.svg (8.984kB)
-// static/image.webp (10.568kB)
-// static/index.html (10.917kB)
-// static/moby.html (3.742kB)
-// static/sample.json (421B)
-// static/sample.xml (522B)
-// static/utf8.html (14.24kB)
+// forms-post.html (1.398kB)
+// image.jpeg (35.588kB)
+// image.png (8.09kB)
+// image.svg (8.984kB)
+// image.webp (10.568kB)
+// index.html (10.917kB)
+// moby.html (3.742kB)
+// sample.json (421B)
+// sample.xml (522B)
+// utf8.html (14.24kB)
package assets
--
GitLab