Skip to content

Commit

Permalink
ci: fix broken build
Browse files Browse the repository at this point in the history
The master build is currently failing because of golang.org/issue/44106.
The part of CI that is failing is a sanity check that that ensures we
can pull cuelang.org/go through proxy.golang.org. This network-dependent
test only needs to run on master commits (indeed it doesn't make sense
for CLs).

Work around that by doing a go get -d on cuelang.org/go/cmd/cue.

Change-Id: Ifa7409556c6c5f813846a071d3956c1fa8609c9e
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/8565
Reviewed-by: CUE cueckoo <cueckoo@gmail.com>
Reviewed-by: Paul Jolly <paul@myitcv.org.uk>
  • Loading branch information
myitcv committed Feb 4, 2021
1 parent 611d622 commit e097927
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v
- if: ${{ startsWith(github.ref, 'refs/heads/ci/') && failure() }}
name: Post any failures for this matrix entry
run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"message":"Build
Expand Down
4 changes: 2 additions & 2 deletions cmd/cue/cmd/testdata/script/cmd_github.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v
- if: ${{ startsWith(github.ref, 'refs/heads/ci/') && failure() }}
name: Post any failures for this matrix entry
run: 'curl -f -s -H "Content-Type: application/json" --request POST --data ''{"message":"Build
Expand Down Expand Up @@ -1238,7 +1238,7 @@ test: _#bashWorkflow & {
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v
"""
if: "${{ \(_#isMaster) }}"
}
Expand Down
4 changes: 2 additions & 2 deletions cue/testdata/eval/github.txtar
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ test: _#bashWorkflow & {
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v
"""
if: "${{ \(_#isMaster) }}"
}
Expand Down Expand Up @@ -2117,7 +2117,7 @@ import "strings"
_#isMaster: "github.ref == '\((〈1;_#branchRefPrefix〉 + 〈1;_#masterBranch〉))'"
_#pullThroughProxy: (〈1;_#step〉 & {
name: "Pull this commit through the proxy on \(〈2;_#masterBranch〉)"
run: "v=$(git rev-parse HEAD)\ncd $(mktemp -d)\ngo mod init mod.com\nGOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v"
run: "v=$(git rev-parse HEAD)\ncd $(mktemp -d)\ngo mod init mod.com\nGOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v"
if: "${{ \(〈1;_#isMaster〉) }}"
})
_#startCLBuild: (〈1;_#step〉 & {
Expand Down
2 changes: 1 addition & 1 deletion internal/ci/workflows.cue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ test: _#bashWorkflow & {
v=$(git rev-parse HEAD)
cd $(mktemp -d)
go mod init mod.com
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go@$v
GOPROXY=https://proxy.golang.org go get -d cuelang.org/go/cmd/cue@$v
"""
if: "${{ \(_#isMaster) }}"
}
Expand Down

0 comments on commit e097927

Please sign in to comment.