Skip to content

Commit

Permalink
ci: fix up some build breakages
Browse files Browse the repository at this point in the history
Fix a bad check on pulling master through the proxy. We need to use go
get -d. Tested locally.

Also restrict our generation to the exact Go 1.14.x version specified in
the matrix, and do not run on Windows (it's flaky for some reason).

Unfortunately the trybot run for this change will fail because the tests
triggered by the runtrybot use the workflow files from master on GitHub.
So we will need to submit the CL to see the results.

Change-Id: I7fb0bac3a2971b349d35a2ef15aec05fe921a48c
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/6065
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
  • Loading branch information
myitcv authored and mpvl committed May 15, 2020
1 parent 238d821 commit 063fa12
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}

Expand All @@ -39,6 +39,9 @@ jobs:
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Generate
# The Go version corresponds to the precise 1.14.x version specified in
# the matrix. Skip windows for now until we work out why re-gen is flaky
if: matrix.go-version == "1.14.3" && matrix.platform != "windows-latest"
run: go generate ./...

- name: Test
Expand All @@ -58,4 +61,4 @@ jobs:
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
3 changes: 3 additions & 0 deletions .github/workflows/test_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ jobs:
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Generate
# The Go version corresponds to the precise 1.14.x version specified in
# the matrix. Skip windows for now until we work out why re-gen is flaky
if: matrix.go-version == "1.14.3" && matrix.platform != "windows-latest"
run: go generate ./...

- name: Test
Expand Down

0 comments on commit 063fa12

Please sign in to comment.