feat(be): update for go 1.18

semaphoreui · Jun 21, 2022 · 0c60a1b · 0c60a1b
1 parent f488b13
commit 0c60a1b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 28 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -3,19 +3,18 @@ on:
   push:
     branches:
       - develop
-      - github_actions
 
 jobs:
   build-local:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.17 }
+        with: { go-version: 1.18 }
 
       - uses: actions/setup-node@v3
         with: { node-version: '16' }
 
-      - run: go get github.com/go-task/task/v3/cmd/task
+      - run: go install github.com/go-task/task/v3/cmd/task
 
       - uses: actions/checkout@v3
 
@@ -38,12 +37,12 @@ jobs:
   #   runs-on: [ubuntu-latest]
   #   steps:
   #     - uses: actions/setup-go@v3
-  #       with: { go-version: 1.17 }
+  #       with: { go-version: 1.18 }
 
   #     - uses: actions/setup-node@v3
   #       with: { node-version: '14' }
 
-  #     - run: go get github.com/go-task/task/v3/cmd/task
+  #     - run: go install github.com/go-task/task/v3/cmd/task
 
   #     - uses: actions/checkout@v3
 
@@ -65,9 +64,9 @@ jobs:
     needs: build-local
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.17 }
+        with: { go-version: 1.18 }
 
-      - run: go get github.com/go-task/task/v3/cmd/task
+      - run: go install github.com/go-task/task/v3/cmd/task
 
       - uses: actions/checkout@v3
 
@@ -102,9 +101,9 @@ jobs:
     needs: [test-db-migration]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.17 }
+        with: { go-version: 1.18 }
 
-      - run: go get github.com/go-task/task/v3/cmd/task
+      - run: go install github.com/go-task/task/v3/cmd/task
 
       - uses: actions/checkout@v3
 
@@ -116,9 +115,9 @@ jobs:
   #   runs-on: [ubuntu-latest]
   #   steps:
   #     - uses: actions/setup-go@v3
-  #       with: { go-version: 1.17 }
+  #       with: { go-version: 1.18 }
 
-  #     - run: go get github.com/go-task/task/v3/cmd/task
+  #     - run: go install github.com/go-task/task/v3/cmd/task
 
   #     - uses: actions/checkout@v3
 
@@ -130,9 +129,9 @@ jobs:
   #   runs-on: [ubuntu-latest]
   #   steps:
   #     - uses: actions/setup-go@v3
-  #       with: { go-version: 1.17 }
+  #       with: { go-version: 1.18 }
 
-  #     - run: go get github.com/go-task/task/v3/cmd/task
+  #     - run: go install github.com/go-task/task/v3/cmd/task
 
   #     - uses: actions/checkout@v3
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
   #   runs-on: [ubuntu-latest]
   #   steps:
   #     - uses: actions/setup-go@v3
-  #       with: { go-version: 1.17 }
+  #       with: { go-version: 1.18 }
 
-  #     - run: go get github.com/go-task/task/v3/cmd/task
+  #     - run: go install github.com/go-task/task/v3/cmd/task
 
   #     - uses: actions/checkout@v3
 
@@ -28,12 +28,12 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.17 }
+        with: { go-version: 1.18 }
 
       - uses: actions/setup-node@v3
         with: { node-version: '16' }
 
-      - run: go get github.com/go-task/task/v3/cmd/task
+      - run: go install github.com/go-task/task/v3/cmd/task
 
       - run: sudo apt update && sudo apt-get install rpm
 

diff --git a/deployment/docker/ci/Dockerfile b/deployment/docker/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13
+FROM golang:1.18.3-alpine3.16
 
 ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
     SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}" \

diff --git a/deployment/docker/ci/dredd.Dockerfile b/deployment/docker/ci/dredd.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13 as golang
+FROM golang:1.18.3-alpine3.16 as golang
 
 RUN apk add --no-cache curl git
 

diff --git a/deployment/docker/dev/Dockerfile b/deployment/docker/dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13
+FROM golang:1.18.3-alpine3.16
 
 ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
     SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}" \

diff --git a/deployment/docker/dev/dredd.Dockerfile b/deployment/docker/dev/dredd.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13 as golang
+FROM golang:1.18.3-alpine3.16 as golang
 
 RUN apk add --no-cache curl git
 

diff --git a/deployment/docker/prod/Dockerfile b/deployment/docker/prod/Dockerfile
@@ -1,5 +1,5 @@
 # ansible-semaphore production image
-FROM golang:1.16.3-alpine3.13 as builder
+FROM golang:1.18.3-alpine3.16 as builder
 
 LABEL maintainer="Tom Whiston <tom.whiston@gmail.com>"
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ansible-semaphore/semaphore
 
-go 1.16
+go 1.18
 
 require (
 	github.com/Sirupsen/logrus v1.0.4
@@ -9,23 +9,32 @@ require (
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/gobuffalo/packr v1.10.4
 	github.com/google/go-github v17.0.0+incompatible
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.3
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/websocket v1.4.1
-	github.com/lann/builder v0.0.0-20180216234317-1b87b36280d0 // indirect
-	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lib/pq v1.2.0
 	github.com/masterminds/squirrel v0.0.0-20170825200431-a6b93000bd21
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/sirupsen/logrus v1.4.2 // indirect
 	github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
 	github.com/spf13/cobra v1.2.1
 	go.etcd.io/bbolt v1.3.2
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+)
+
+require (
+	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/lann/builder v0.0.0-20180216234317-1b87b36280d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
 	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 )