From 776e1780a9a4fbc7cdb1ed3cf2695130742d0d21 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Fri, 10 Sep 2021 10:38:21 +0200
Subject: [PATCH] .github/workflows: merge test and gotip workflows

---
 .github/workflows/gotip.yml | 32 --------------------------------
 .github/workflows/test.yml  | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/gotip.yml

diff --git a/.github/workflows/gotip.yml b/.github/workflows/gotip.yml
deleted file mode 100644
index 19e7f3b..0000000
--- a/.github/workflows/gotip.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-on: [push, pull_request]
-name: Go tip tests
-permissions:
-  contents: read
-jobs:
-  test:
-    name: Test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Install Go tip (UNIX)
-        if: runner.os != 'Windows'
-        run: |
-          git clone --filter=tree:0 https://go.googlesource.com/go $HOME/gotip
-          cd $HOME/gotip/src && ./make.bash
-          echo "$HOME/gotip/bin" >> $GITHUB_PATH
-      - name: Install Go tip (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          git clone --filter=tree:0 https://go.googlesource.com/go $HOME/gotip
-          cd $HOME/gotip/src && ./make.bat
-          echo "$HOME/gotip/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - run: go version
-      - name: Run tests
-        run: go test -race ./...
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8871230..7762287 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,3 +22,30 @@ jobs:
           fetch-depth: 0
       - name: Run tests
         run: go test -race ./...
+  gotip:
+    name: Test (Go tip)
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Install Go tip (UNIX)
+        if: runner.os != 'Windows'
+        run: |
+          git clone --filter=tree:0 https://go.googlesource.com/go $HOME/gotip
+          cd $HOME/gotip/src && ./make.bash
+          echo "$HOME/gotip/bin" >> $GITHUB_PATH
+      - name: Install Go tip (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          git clone --filter=tree:0 https://go.googlesource.com/go $HOME/gotip
+          cd $HOME/gotip/src && ./make.bat
+          echo "$HOME/gotip/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: go version
+      - name: Run tests
+        run: go test -race ./...