From 0528e8ceb952ebad5ea8db0112a87918cf277d52 Mon Sep 17 00:00:00 2001
From: Suyash Kumar <suyashkumar2003@gmail.com>
Date: Tue, 23 Aug 2022 21:17:22 -0400
Subject: [PATCH] Update go to 1.18 (#244)

---
 .github/workflows/bench_pr.yml   | 14 +++++++-------
 .github/workflows/bench_push.yml | 13 +++++++------
 .github/workflows/go.yml         |  6 +++---
 go.mod                           |  6 ++++--
 go.sum                           |  3 ++-
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/bench_pr.yml b/.github/workflows/bench_pr.yml
index bbfc8a7e..e1bd4120 100644
--- a/.github/workflows/bench_pr.yml
+++ b/.github/workflows/bench_pr.yml
@@ -4,12 +4,13 @@ jobs:
   build:
     name: Benchmark (PR)
     runs-on: ubuntu-latest
+    env:
+      GOBIN: /home/runner/go
     steps:
-
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.18
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.18
       id: go
 
     - name: Check out code 
@@ -21,8 +22,7 @@ jobs:
   
     - name: Benchmark against GITHUB_BASE_REF
       run: |
-       export PATH=$PATH:$GOBIN
-       go get golang.org/x/perf/cmd/benchstat
+       go install golang.org/x/perf/cmd/benchstat@latest
        echo "New Commit:"
        git log -1 --format="%H"
        go test -bench=. -benchtime=.75s -count=8 > $HOME/new.txt
@@ -31,5 +31,5 @@ jobs:
        echo "Base Commit:"
        git log -1 --format="%H"
        go test -bench=. -benchtime=.75s -count=8 > $HOME/old.txt
-       benchstat $HOME/old.txt $HOME/new.txt
+       $GOBIN/benchstat $HOME/old.txt $HOME/new.txt
        
diff --git a/.github/workflows/bench_push.yml b/.github/workflows/bench_push.yml
index 22c037af..d21aca52 100644
--- a/.github/workflows/bench_push.yml
+++ b/.github/workflows/bench_push.yml
@@ -4,11 +4,13 @@ jobs:
   build:
     name: Benchmark (push)
     runs-on: ubuntu-latest
+    env:
+      GOBIN: /home/runner/go
     steps:
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.18
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.18
       id: go
 
     - name: Check out code 
@@ -20,8 +22,7 @@ jobs:
   
     - name: Benchmark (against HEAD~1)
       run: |
-       export PATH=$PATH:$GOBIN
-       go get golang.org/x/perf/cmd/benchstat
+       go install golang.org/x/perf/cmd/benchstat@latest
        echo "New Commit:"
        git log -1 --format="%H"
        go test -bench=. -benchtime=.75s -count=8 > $HOME/new.txt
@@ -30,4 +31,4 @@ jobs:
        echo "Base Commit:"
        git log -1 --format="%H"
        go test -bench=. -benchtime=.75s -count=8 > $HOME/old.txt
-       benchstat $HOME/old.txt $HOME/new.txt
+       $GOBIN/benchstat $HOME/old.txt $HOME/new.txt
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ff8f59ad..73512be3 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.18
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.18
       id: go
 
     - name: Check out code 
diff --git a/go.mod b/go.mod
index de5b8a0c..013913e9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,11 @@
 module github.com/suyashkumar/dicom
 
-go 1.13
+go 1.18
 
 require (
 	github.com/golang/mock v1.4.4
 	github.com/google/go-cmp v0.5.2
-	golang.org/x/text v0.3.0
+	golang.org/x/text v0.3.7
 )
+
+require golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
diff --git a/go.sum b/go.sum
index ad35aa32..e3298aa7 100644
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,9 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=