Upgrade to Go 1.18 (warrensbox#232)

* Upgrade to Go 1.18 * Fix image ref * Fix git endpoint * Fix CircleCI workflow * Update Makefile Co-authored-by: George L. Yermulnik <[email protected]> * Fix makefile Co-authored-by: George L. Yermulnik <[email protected]>
davidvasandani · Oct 26, 2022 · 97cfe97 · 97cfe97
1 parent f8fb418
commit 97cfe97
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.16
+      - image: cimg/go:1.18
 
     working_directory: /go/src/github.com/warrensbox/terraform-switcher
 
@@ -14,9 +14,9 @@ jobs:
       - run: 
           command: |    
             set +e  
-            echo "Building website" 
-            sudo apt-get install python3
-            sudo apt-get install python3-pip
+            echo "Building website"
+            sudo apt-get update
+            sudo apt-get install python3 python3-pip
             pip3 install mkdocs-material
             cd www
             mkdocs gh-deploy --force
@@ -32,7 +32,7 @@ jobs:
 
   release:
     docker:
-      - image: circleci/golang:1.16
+      - image: cimg/go:1.18
 
     working_directory: /go/src/github.com/warrensbox/terraform-switcher
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 EXE  := tfswitch
 PKG  := github.com/warrensbox/terraform-switcher
-VER := $(shell git ls-remote --tags https://github.com/warrensbox/terraform-switcher | awk '{print $$2}'| awk -F"/" '{print $$3}' | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -n 2 | head -n1)
+VER := $(shell git ls-remote --tags git@github.com:warrensbox/terraform-switcher.git | awk '{if ($$2 ~ "\\^\\{\\}$$") next; print vers[split($$2,vers,"\\/")]}' | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)
 PATH := build:$(PATH)
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)

diff --git a/go.mod b/go.mod
@@ -1,26 +1,42 @@
 module github.com/warrensbox/terraform-switcher
 
-go 1.13
+go 1.18
 
 require (
-	github.com/chzyer/logex v1.1.10 // indirect
-	github.com/chzyer/readline v0.0.0-20171208011716-f6d7a1f6fbf3 // indirect
-	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/hashicorp/go-version v1.4.0
 	github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f
+	github.com/manifoldco/promptui v0.2.2-0.20180308161052-c0c0d3afc6a0
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30
+	github.com/spf13/viper v1.4.0
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
+)
+
+require (
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-textseg v1.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/chzyer/logex v1.1.10 // indirect
+	github.com/chzyer/readline v0.0.0-20171208011716-f6d7a1f6fbf3 // indirect
+	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
+	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.0.0 // indirect
 	github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect
 	github.com/lunixbochs/vtclean v0.0.0-20170504063817-d14193dfc626 // indirect
 	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/manifoldco/promptui v0.2.2-0.20180308161052-c0c0d3afc6a0
 	github.com/mattn/go-colorable v0.0.9 // indirect
 	github.com/mattn/go-isatty v0.0.3 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/pelletier/go-toml v1.4.0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
+	github.com/spf13/cast v1.3.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.4.0
+	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/zclconf/go-cty v1.8.0 // indirect
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
+	golang.org/x/text v0.3.5 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
 )