From bdc2d9fde91dbe70b60e396d3c4694300d04b710 Mon Sep 17 00:00:00 2001
From: Jason Hall <jasonhall@redhat.com>
Date: Sat, 19 Mar 2022 08:33:20 -0400
Subject: [PATCH] Include builds for Go 1.18 in CI matrixes (#652)

---
 .github/workflows/build.yaml                    | 13 +------------
 .github/workflows/modules-integration-test.yaml |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b26ee7848f..aca2d76d6f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,18 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v2
         with:
-          # TODO: when 1.18 is released, just make this
-          # ${{ matrix.go-version }} and delete the next step.
-          go-version: '1.17.x'
-
-      # Use the installed Go version to download and install the latest 1.18
-      # release candidate and replace our existing go with that one.
-      - if: ${{ matrix.go-version == '1.18.x' }}
-        run: |
-          go install golang.org/dl/go1.18rc1@latest
-          go1.18rc1 download
-          cp $(which go1.18rc1) $(which go)
-          go version
+          go-version: ${{ matrix.go-version }}
 
       - run: |
           go build ./...
diff --git a/.github/workflows/modules-integration-test.yaml b/.github/workflows/modules-integration-test.yaml
index ddcc425af3..7b645059e4 100644
--- a/.github/workflows/modules-integration-test.yaml
+++ b/.github/workflows/modules-integration-test.yaml
@@ -9,7 +9,7 @@ jobs:
     name: Module Tests
     strategy:
       matrix:
-        go-version: [1.16.x, 1.17.x]
+        go-version: [1.16.x, 1.17.x, 1.18.x]
     runs-on: 'ubuntu-latest'
     steps:
       - uses: actions/setup-go@v2