ci: fix broken build
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>
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b43127f..fc5fc9e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,7 +76,7 @@
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
diff --git a/cmd/cue/cmd/testdata/script/cmd_github.txt b/cmd/cue/cmd/testdata/script/cmd_github.txt
index 72bb7a0..0e81aa5 100644
--- a/cmd/cue/cmd/testdata/script/cmd_github.txt
+++ b/cmd/cue/cmd/testdata/script/cmd_github.txt
@@ -197,7 +197,7 @@
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
@@ -1238,7 +1238,7 @@
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) }}"
}
diff --git a/cue/testdata/eval/github.txtar b/cue/testdata/eval/github.txtar
index 609eba2..97ab729 100644
--- a/cue/testdata/eval/github.txtar
+++ b/cue/testdata/eval/github.txtar
@@ -85,7 +85,7 @@
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) }}"
}
@@ -2117,7 +2117,7 @@
_#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〉 & {
diff --git a/internal/ci/workflows.cue b/internal/ci/workflows.cue
index 99dc6ac..12664cb 100644
--- a/internal/ci/workflows.cue
+++ b/internal/ci/workflows.cue
@@ -121,7 +121,7 @@
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) }}"
}
