Merge branch 'master' into add-free-endpoints

coupergateway · Jan 25, 2021 · d2ec48c · d2ec48c
2 parents e8dbcb1 + 9ed7487
commit d2ec48c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -23,7 +23,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Test
-      run: go test -v -timeout 30s -race ./...
+      run: go test -v -timeout 60s -race ./...
 
     - name: Build and push edge docker image
       if: github.event_name == 'push'

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Test
-      run: go test -v -timeout 30s -race ./...
+      run: go test -v -timeout 60s -race ./...
 
     - name: Build binary
       run: go build -v -o couper .