Merge branch 'master' into go1.18

This commit is contained in:
Matt Joiner 2022-02-10 15:35:29 +11:00
commit f521c78de6
2 changed files with 2 additions and 2 deletions

View File

@ -45,7 +45,7 @@ runs:
- name: Install gotip - name: Install gotip
if: matrix.go-version == 'tip' if: matrix.go-version == 'tip'
run: | run: |
git clone --depth=1 https://go.googlesource.com/go "$GOTIP_PATH" || true git clone --depth=1 https://github.com/golang/go "$GOTIP_PATH" || true
cd "$GOTIP_PATH" cd "$GOTIP_PATH"
git pull git pull
echo "GOROOT=$GOTIP_PATH" >> "$GITHUB_ENV" echo "GOROOT=$GOTIP_PATH" >> "$GITHUB_ENV"

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
jobs: jobs:
test: test:
timeout-minutes: 10 timeout-minutes: 30
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix: