Merge remote-tracking branch 'origin/master' into search

.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 ./...

.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"