Skip to content

Commit 273b8ce

Browse files
committed
[dev] Update go to 1.16.3
1 parent 745dfbc commit 273b8ce

File tree

13 files changed

+20
-19
lines changed

13 files changed

+20
-19
lines changed

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tasks:
3232
- before: scripts/branch-namespace.sh
3333
init: yarn --network-timeout 100000 && yarn build
3434
- name: Go
35-
init: leeway exec --filter-type go -v -- go mod download
35+
init: leeway exec --filter-type go -v -- go mod verify
3636
openMode: split-right
3737
vscode:
3838
extensions:

.werft/run-integration-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pod:
3636
- bash
3737
- -c
3838
- |
39-
39+
4040
echo "[prep] preparing config."
4141
4242
gcloud auth activate-service-account --key-file /mnt/secrets/gcp-sa/service-account.json
@@ -74,6 +74,6 @@ pod:
7474
echo "[prep|DONE]"
7575
7676
/entrypoint.sh -kubeconfig=/config/kubeconfig -namespace={{ .Annotations.namespace }} -username=$USERNAME 2>&1 | ts "[int-tests] "
77-
77+
7878
RC=${PIPESTATUS[0]}
7979
if [ $RC -eq 1 ]; then echo "[int-tests|FAIL]"; else echo "[int-tests|DONE]"; fi

.werft/wipe-devstaging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
mountPath: /mnt/secrets/gcp-sa
2323
readOnly: true
2424
command:
25-
- bash
25+
- bash
2626
- -c
2727
- |
2828
sleep 1

WORKSPACE.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ defaultArgs:
44
coreYarnLockBase: ../..
55
publishToNPM: true
66

7-
defaultVariant:
7+
defaultVariant:
88
config:
99
go:
1010
lintCommand: ["golangci-lint", "run", "--disable", "govet,typecheck"]
11+
buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
1112

1213
variants:
1314
- name: oss

components/docker-up/BUILD.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ packages:
1515
- ["go", "generate"]
1616
config:
1717
dontTest: true
18-
buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
1918
- name: bin-runc-facade
2019
type: go
2120
srcs:
@@ -30,7 +29,6 @@ packages:
3029
- ["rmdir", "runc-facade"]
3130
config:
3231
dontTest: true
33-
buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
3432
- name: bin-slirp-docker-proxy
3533
type: go
3634
srcs:
@@ -45,7 +43,6 @@ packages:
4543
- ["rmdir", "slirp-docker-proxy"]
4644
config:
4745
dontTest: true
48-
buildCommand: ["go", "build", "-trimpath", "-ldflags='-buildid= -w -s'"]
4946
- name: app
5047
type: generic
5148
deps:

components/gitpod-protocol/go/BUILD.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ packages:
1010
- GOOS=linux
1111
config:
1212
packaging: library
13-
buildFlags:
14-
- "-ldflags=-w"
13+
buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]

components/supervisor/BUILD.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ packages:
1515
env:
1616
- CGO_ENABLED=0
1717
- GOOS=linux
18-
config:
19-
buildFlags:
20-
- "-ldflags=-w"
2118
- name: docker
2219
type: docker
2320
srcs:

components/ws-daemon/BUILD.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ packages:
1717
- GOOS=linux
1818
config:
1919
packaging: app
20+
buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
2021
- name: content-initializer
2122
type: go
2223
srcs:
@@ -37,6 +38,7 @@ packages:
3738
config:
3839
packaging: app
3940
dontTest: true
41+
buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
4042
- name: docker
4143
type: docker
4244
deps:

components/ws-manager/BUILD.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ packages:
1818
- GOOS=linux
1919
config:
2020
packaging: app
21-
buildCommand: ["go", "build", "-trimpath", "-ldflags", "-w -extldflags \"-static\""]
2221
- name: docker
2322
type: docker
2423
deps:

components/ws-proxy/BUILD.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ packages:
1717
- GOOS=linux
1818
config:
1919
packaging: app
20+
buildCommand: ["go", "build", "-trimpath", "-ldflags=-buildid="]
2021
- name: docker
2122
type: docker
2223
srcs:

dev/gpctl/BUILD.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ packages:
1818
config:
1919
packaging: app
2020
dontTest: true
21+

dev/image/Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,13 @@ ENV PATH=/home/gitpod/.nvm/versions/node/v${GITPOD_NODE_VERSION}/bin:$PATH
114114
# Fix the Go version
115115
ENV GOPATH=$HOME/go-packages
116116
ENV GOROOT=$HOME/go
117-
RUN go get golang.org/dl/go1.16 && \
118-
go1.16 download && \
119-
mv $(which go1.16) $(which go)
120-
ENV GOPATH=/workspace/go \
121-
PATH=/workspace/go/bin:$PATH
117+
RUN go get golang.org/dl/go1.16.3 \
118+
&& go1.16.3 download \
119+
&& mv $(which go1.16.3) $(which go)
120+
ENV GOPATH=/workspace/go
121+
ENV PATH=/workspace/go/bin:$PATH
122+
123+
ENV GOFLAGS="-mod=readonly"
122124

123125
## Register leeway autocompletion in bashrc
124126
RUN bash -c "echo . \<\(leeway bash-completion\) >> ~/.bashrc"

install/installer/BUILD.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ packages:
99
env:
1010
- CGO_ENABLED=0
1111
- GOOS=linux
12+
config:
13+
packaging: app
1214
- name: docker
1315
type: docker
1416
srcs:

0 commit comments

Comments
 (0)