From 14bbb180923dde4c2aed25bca1495da8cfc6a89c Mon Sep 17 00:00:00 2001
From: Travis Cline <travis.cline@gmail.com>
Date: Wed, 29 Jun 2022 23:44:06 -0700
Subject: [PATCH] github: Update integration tests

---
 .github/workflows/check-federation  |  2 +-
 .github/workflows/check-integration |  2 +-
 .github/workflows/integration.yml   | 33 +++++++++++++++++++++--------
 .github/workflows/lint.yml          |  3 ---
 .github/workflows/security.yml      |  8 +++----
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/check-federation b/.github/workflows/check-federation
index 314452c58ac..d99e98a91f8 100755
--- a/.github/workflows/check-federation
+++ b/.github/workflows/check-federation
@@ -6,7 +6,7 @@ cd _examples/federation
 
 ./start.sh &
 
-sleep 10
+sleep 12
 
 echo "### running jest integration spec"
 ./node_modules/.bin/jest --color
diff --git a/.github/workflows/check-integration b/.github/workflows/check-integration
index 2472628acf2..89ca7b9c63f 100755
--- a/.github/workflows/check-integration
+++ b/.github/workflows/check-integration
@@ -6,7 +6,7 @@ cd integration
 
 go run ./server/server.go &
 
-sleep 2
+sleep 5
 
 echo "### running jest integration spec"
 ./node_modules/.bin/jest --color
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index d6b0276ea6e..f46bc6fa632 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -1,35 +1,50 @@
 name: Integration
 on: [push, pull_request]
 
-env:
-  GO_VERSION: 1.16
-
 jobs:
   integration:
+    strategy:
+      matrix:
+        go: [1.16, 1.17, 1.18]
     runs-on: ubuntu-latest
     timeout-minutes: 3
-    container: golang:${{ env.GO_VERSION }}-alpine
     steps:
       - uses: actions/checkout@v3
-      - run: apk add --no-cache --no-progress nodejs npm git bash
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
       - run: go mod download
       - run: cd integration ; npm install
       - run: .github/workflows/check-integration
 
   federation:
+    strategy:
+      matrix:
+        go: [1.16, 1.17, 1.18]
     runs-on: ubuntu-latest
-    container: golang:${{ env.GO_VERSION }}-alpine
     steps:
       - uses: actions/checkout@v3
-      - run: apk add --no-cache --no-progress nodejs npm git bash
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
       - run: go mod download
       - run: cd _examples/federation ; npm install
       - run: .github/workflows/check-federation
 
   init:
+    strategy:
+      matrix:
+        go: [1.16, 1.17, 1.18]
     runs-on: ubuntu-latest
-    container: golang:${{ env.GO_VERSION }}-alpine
     steps:
       - uses: actions/checkout@v3
-      - run: apk add --no-cache --no-progress alpine-sdk bash
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
       - run: .github/workflows/check-init
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 68d671a0472..37d6f55e877 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,9 +1,6 @@
 name: Lint
 on: [push, pull_request]
 
-env:
-  GO_VERSION: 1.16
-
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 4c558310dad..d78a6150f9b 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -1,16 +1,16 @@
 name: Security
 on: [push, pull_request]
 
-env:
-  GO_VERSION: 1.16
-
 jobs:
   nancy:
+    strategy:
+      matrix:
+        go: [1.16, 1.17, 1.18]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ matrix.go }}
       - run: go mod download && go list -json -deps all > go.list
       - uses: sonatype-nexus-community/nancy-github-action@main