From 30502788230a16579393a832a869521986d572a1 Mon Sep 17 00:00:00 2001
From: Graham Clark <grclark@gmail.com>
Date: Sat, 4 Jun 2022 11:16:30 -0400
Subject: [PATCH 1/2] Update the github build workflow

Use Go 1.18
---
 .github/workflows/go.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 90477aa..5cd43f0 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,22 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.13
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.18
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.13
+        go-version: '>=1.18.0'
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
       run: |
         go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
 
     - name: Build
       run: go build -v ./...

From 1eacb3517f54f4f428ce0a5124ff3c3e71e8043d Mon Sep 17 00:00:00 2001
From: Graham Clark <grclark@gmail.com>
Date: Sat, 4 Jun 2022 11:16:51 -0400
Subject: [PATCH 2/2] Update Travis build workflow for Go 1.18

There are performance improvements here for amd64.
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2af9213..1412d4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ branches:
 git:
   depth: false
 go:
+- 1.18.x
 - 1.17.x
 - 1.16.x
 - 1.15.x
@@ -34,7 +35,7 @@ deploy:
   script: bash scripts/do-release.sh
   on:
     all_branches: true
-    condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = 1.17.x"
+    condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = 1.18.x"
 - provider: gcs
   skip_cleanup: true
   access_key_id: GOOGKKO2OYB5BE3XDNBJMDRK
@@ -47,4 +48,4 @@ deploy:
   on:
     repo: gcla/termshark
     all_branches: true
-    condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = 1.17.x"
+    condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = 1.18.x"