this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

internal/ci: remove gorelease check step

It appears to be of no use at the moment; without any arguments, it
simply suggests what the current code could be versioned as, when
compared to the latest semver version. I could only get it to fail if
the repository has unstaged changes, which we already catch elsewhere.

Remove it for now; we may add it again in the future as part of our
release process. While here, remove tools.go, which was only used for
gorelease and for goimports, which we don't use either.

In the future, if we need any versioned tool, we can run the following
instead of using the old "tools.go" approach:

go run path/to/tool@commit-or-tag [args]

Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
Change-Id: I7a50bf5d4b09b3f41a32131249d0633d87f1c408
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/537221
Unity-Result: CUEcueckoo <cueckoo@cuelang.org>
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
Reviewed-by: Paul Jolly <paul@myitcv.io>

+6 -84
-2
.github/workflows/test.yml
··· 92 92 - if: ${{ matrix.go-version == '1.18.x' && matrix.os == 'ubuntu-20.04' }} 93 93 name: Test with -race 94 94 run: go test -race ./... 95 - - name: gorelease check 96 - run: go run golang.org/x/exp/cmd/gorelease 97 95 - name: Check that git is clean post generate and tests 98 96 run: test -z "$(git status --porcelain)" || (git status; git diff; false) 99 97 - if: ${{ github.ref == 'refs/heads/master' }}
+1 -7
cmd/cue/cmd/testdata/script/cmd_github.txt
··· 218 218 - if: ${{ matrix.go-version == '1.18.x' && matrix.os == 'ubuntu-20.04' }} 219 219 name: Test with -race 220 220 run: go test -race ./... 221 - - name: gorelease check 222 - run: go run golang.org/x/exp/cmd/gorelease 223 221 - name: Check that git is clean post generate and tests 224 222 run: test -z "$(git status --porcelain)" || (git status; git diff; false) 225 223 - if: ${{ github.ref == 'refs/heads/master' }} ··· 1144 1142 run: "echo CUE_LONG=true >> $GITHUB_ENV" 1145 1143 }, _#goGenerate, _#goTest, _#goTestRace & { 1146 1144 if: "${{ matrix.go-version == '\(_#latestStableGo)' && matrix.os == '\(_#linuxMachine)' }}" 1147 - }, _#goReleaseCheck, _#checkGitClean, _#pullThroughProxy, _#failCLBuild] 1145 + }, _#checkGitClean, _#pullThroughProxy, _#failCLBuild] 1148 1146 } 1149 1147 mark_ci_success: { 1150 1148 "runs-on": _#linuxMachine ··· 1412 1410 _#goTestRace: _#step & { 1413 1411 name: "Test with -race" 1414 1412 run: "go test -race ./..." 1415 - } 1416 - _#goReleaseCheck: _#step & { 1417 - name: "gorelease check" 1418 - run: "go run golang.org/x/exp/cmd/gorelease" 1419 1413 } 1420 1414 _#checkGitClean: _#step & { 1421 1415 name: "Check that git is clean post generate and tests"
+5 -26
cue/testdata/eval/github.txtar
··· 60 60 run: "echo CUE_LONG=true >> $GITHUB_ENV" 61 61 }, _#goGenerate, _#goTest, _#goTestRace & { 62 62 if: "${{ matrix.go-version == '\(_#latestStableGo)' && matrix.os == '\(_#linuxMachine)' }}" 63 - }, _#goReleaseCheck, _#checkGitClean, _#pullThroughProxy, _#failCLBuild] 63 + }, _#checkGitClean, _#pullThroughProxy, _#failCLBuild] 64 64 } 65 65 mark_ci_success: { 66 66 "runs-on": _#linuxMachine ··· 328 328 _#goTestRace: _#step & { 329 329 name: "Test with -race" 330 330 run: "go test -race ./..." 331 - } 332 - _#goReleaseCheck: _#step & { 333 - name: "gorelease check" 334 - run: "go run golang.org/x/exp/cmd/gorelease" 335 331 } 336 332 _#checkGitClean: _#step & { 337 333 name: "Check that git is clean post generate and tests" ··· 1159 1155 if: (string){ "${{ matrix.go-version == '1.18.x' && matrix.os == 'ubuntu-20.04' }}" } 1160 1156 } 1161 1157 9: (#struct){ 1162 - name: (string){ "gorelease check" } 1163 - run: (string){ "go run golang.org/x/exp/cmd/gorelease" } 1164 - } 1165 - 10: (#struct){ 1166 1158 name: (string){ "Check that git is clean post generate and tests" } 1167 1159 run: (string){ "test -z \"$(git status --porcelain)\" || (git status; git diff; false)" } 1168 1160 } 1169 - 11: (#struct){ 1161 + 10: (#struct){ 1170 1162 name: (string){ "Pull this commit through the proxy on master" } 1171 1163 run: (string){ "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" } 1172 1164 if: (string){ "${{ github.ref == 'refs/heads/master' }}" } 1173 1165 } 1174 - 12: (#struct){ 1166 + 11: (#struct){ 1175 1167 if: (string){ "${{ startsWith(github.ref, 'refs/heads/ci/') && failure() }}" } 1176 1168 name: (string){ "Post any failures for this matrix entry" } 1177 1169 run: (string){ "curl -f -s -n -H \"Content-Type: application/json\" --request POST --data \"{\\\"tag\\\":\\\"trybot\\\",\\\"message\\\":\\\"Build failed for ${{ runner.os }}-${{ matrix.go-version }}; see ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} for more details\\\",\\\"labels\\\":{\\\"TryBot-Result\\\":-1}}\" https://review.gerrithub.io/a/changes/$(basename $(dirname $GITHUB_REF))/revisions/$(basename $GITHUB_REF)/review" } ··· 1680 1672 if: (string){ "${{ matrix.go-version == '1.18.x' && matrix.os == 'ubuntu-20.04' }}" } 1681 1673 } 1682 1674 9: (#struct){ 1683 - name: (string){ "gorelease check" } 1684 - run: (string){ "go run golang.org/x/exp/cmd/gorelease" } 1685 - } 1686 - 10: (#struct){ 1687 1675 name: (string){ "Check that git is clean post generate and tests" } 1688 1676 run: (string){ "test -z \"$(git status --porcelain)\" || (git status; git diff; false)" } 1689 1677 } 1690 - 11: (#struct){ 1678 + 10: (#struct){ 1691 1679 name: (string){ "Pull this commit through the proxy on master" } 1692 1680 run: (string){ "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" } 1693 1681 if: (string){ "${{ github.ref == 'refs/heads/master' }}" } 1694 1682 } 1695 - 12: (#struct){ 1683 + 11: (#struct){ 1696 1684 if: (string){ "${{ startsWith(github.ref, 'refs/heads/ci/') && failure() }}" } 1697 1685 name: (string){ "Post any failures for this matrix entry" } 1698 1686 run: (string){ "curl -f -s -n -H \"Content-Type: application/json\" --request POST --data \"{\\\"tag\\\":\\\"trybot\\\",\\\"message\\\":\\\"Build failed for ${{ runner.os }}-${{ matrix.go-version }}; see ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} for more details\\\",\\\"labels\\\":{\\\"TryBot-Result\\\":-1}}\" https://review.gerrithub.io/a/changes/$(basename $(dirname $GITHUB_REF))/revisions/$(basename $GITHUB_REF)/review" } ··· 2189 2177 name: (string){ "Test with -race" } 2190 2178 run: (string){ "go test -race ./..." } 2191 2179 } 2192 - _#goReleaseCheck(:ci): (#struct){ 2193 - name: (string){ "gorelease check" } 2194 - run: (string){ "go run golang.org/x/exp/cmd/gorelease" } 2195 - } 2196 2180 _#checkGitClean(:ci): (#struct){ 2197 2181 name: (string){ "Check that git is clean post generate and tests" } 2198 2182 run: (string){ "test -z \"$(git status --porcelain)\" || (git status; git diff; false)" } ··· 2278 2262 (〈4;_#goTestRace〉 & { 2279 2263 if: "${{ matrix.go-version == '\(〈5;_#latestStableGo〉)' && matrix.os == '\(〈5;_#linuxMachine〉)' }}" 2280 2264 }), 2281 - 〈4;_#goReleaseCheck〉, 2282 2265 〈4;_#checkGitClean〉, 2283 2266 〈3;_#pullThroughProxy〉, 2284 2267 〈3;_#failCLBuild〉, ··· 2570 2553 _#goTestRace: (〈0;_#step〉 & { 2571 2554 name: "Test with -race" 2572 2555 run: "go test -race ./..." 2573 - }) 2574 - _#goReleaseCheck: (〈0;_#step〉 & { 2575 - name: "gorelease check" 2576 - run: "go run golang.org/x/exp/cmd/gorelease" 2577 2556 }) 2578 2557 _#checkGitClean: (〈0;_#step〉 & { 2579 2558 name: "Check that git is clean post generate and tests"
-1
go.mod
··· 16 16 github.com/spf13/cobra v1.4.0 17 17 github.com/spf13/pflag v1.0.5 18 18 github.com/stretchr/testify v1.2.2 19 - golang.org/x/exp v0.0.0-20210126221216-84987778548c 20 19 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b 21 20 golang.org/x/text v0.3.7 22 21 golang.org/x/tools v0.0.0-20200612220849-54c614fe050c
-19
go.sum
··· 1 - dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 2 - github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= 3 1 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= 4 2 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= 5 3 github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE= ··· 9 7 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 10 8 github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw= 11 9 github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= 12 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= 13 10 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= 14 11 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 15 12 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= ··· 51 48 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 52 49 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 53 50 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 54 - golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 55 51 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 56 - golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= 57 - golang.org/x/exp v0.0.0-20210126221216-84987778548c h1:sWZb7hc7UoMhB5/VYk5+nsHuiHq8J5l0osfBYs9C3gw= 58 - golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= 59 - golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= 60 - golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= 61 - golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= 62 - golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= 63 - golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= 64 - golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= 65 - golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 66 52 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 67 53 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= 68 54 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 69 - golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 70 55 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 71 56 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 72 57 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= ··· 75 60 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 76 61 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 77 62 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 78 - golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 79 63 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 80 64 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= 81 65 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= 82 66 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 83 - golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= 84 67 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= 85 - golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 86 - golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 87 68 golang.org/x/tools v0.0.0-20200612220849-54c614fe050c h1:g6oFfz6Cmw68izP3xsdud3Oxu145IPkeFzyRg58AKHM= 88 69 golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= 89 70 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-6
internal/ci/workflows.cue
··· 84 84 _#goTestRace & { 85 85 if: "${{ matrix.go-version == '\(_#latestStableGo)' && matrix.os == '\(_#linuxMachine)' }}" 86 86 }, 87 - _#goReleaseCheck, 88 87 _#checkGitClean, 89 88 _#pullThroughProxy, 90 89 _#failCLBuild, ··· 416 415 _#goTestRace: _#step & { 417 416 name: "Test with -race" 418 417 run: "go test -race ./..." 419 - } 420 - 421 - _#goReleaseCheck: _#step & { 422 - name: "gorelease check" 423 - run: "go run golang.org/x/exp/cmd/gorelease" 424 418 } 425 419 426 420 _#checkGitClean: _#step & {
-23
tools.go
··· 1 - // Copyright 2020 The CUE Authors 2 - // 3 - // Licensed under the Apache License, Version 2.0 (the "License"); 4 - // you may not use this file except in compliance with the License. 5 - // You may obtain a copy of the License at 6 - // 7 - // http://www.apache.org/licenses/LICENSE-2.0 8 - // 9 - // Unless required by applicable law or agreed to in writing, software 10 - // distributed under the License is distributed on an "AS IS" BASIS, 11 - // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 12 - // See the License for the specific language governing permissions and 13 - // limitations under the License. 14 - 15 - //go:build tools 16 - // +build tools 17 - 18 - package tools 19 - 20 - import ( 21 - _ "golang.org/x/exp/cmd/gorelease" 22 - _ "golang.org/x/tools/cmd/goimports" 23 - )