Skip to content

Commit d88c9cb

Browse files
committed
Dockerfile: update Go to 1.19.3
The Go tool is converted to use Go modules, removing the need for the GOROOT env var hack.
1 parent 4a5b65c commit d88c9cb

File tree

8 files changed

+6
-22
lines changed

8 files changed

+6
-22
lines changed

.ci/ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ make -j8 factory-setup
5050
make -j8 bootloader-semihosting
5151
make -j8 firmware-semihosting
5252

53-
make -C tools/go/src/atecc608a test
53+
(cd tools/atecc608a; go test ./...)
5454

5555
# Don't generate graphics in CI
5656
(cd build; cmake -DDOC_GRAPHS=NO ..)

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ENV GOPATH /opt/go
115115
ENV GOROOT /opt/go_dist/go
116116
ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
117117
RUN mkdir -p /opt/go_dist && \
118-
curl https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
118+
curl https://dl.google.com/go/go1.19.3.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
119119

120120
# Install lcov from release (the one from the repos is too old).
121121
RUN cd /opt && wget https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz && tar -xf lcov-1.14.tar.gz

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ dockerdev:
127127
dockerrel:
128128
./scripts/dockerenv.sh release
129129
generate-atecc608-config:
130-
${MAKE} -C tools/go/src/atecc608a run
130+
cd tools/atecc608a && go run main.go
131131
ci:
132132
./.ci/ci
133133
prepare-tidy: | build build-build

tools/atecc608a/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module atecc608a
2+
3+
go 1.19
File renamed without changes.

tools/go/src/atecc608a/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)