Skip to content

Commit df61ff1

Browse files
committed
Fix builder
1 parent 2323e71 commit df61ff1

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.circleci/config.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
- /tmp/docker_pushed
2525
build:
2626
docker:
27-
- image: menedev/yubi-oath-vpn-builder:$CIRCLE_SHA1
28-
29-
working_directory: /go/src/github.com/MeneDev/yubi-oath-vpn
27+
- image: menedev/yubi-oath-vpn-builder:$CIRCLE_SHA1
3028
environment:
3129
GITHUB_USER: MeneDev
3230
GITHUB_PROJECT: yubi-oath-vpn
@@ -49,12 +47,12 @@ jobs:
4947
- /go/.cache
5048

5149
- run:
52-
name: Build project for linux
50+
name: Build project for Linux amd64
5351
command: |
5452
tag="$(semantics --output-tag --dry-run)"
55-
go build -o release/yubi-oath-vpn-linux_amd64 -tags "glib_2_66" -ldflags="-s -w -X \"main.Version=${tag:-not a release}\" -X \"main.BuildDate=$(date --utc)\" -X \"main.BuildNumber=$CIRCLE_BUILD_NUM\" -X \"main.BuildCommit=$CIRCLE_SHA1\"" -v github.com/MeneDev/yubi-oath-vpn/cmd/yubi-oath-vpn
53+
go build -o release/yubi-oath-vpn-linux_amd64 -tags "glib_2_66" -ldflags="-s -w -X \"main.Version=${tag:-not a release}\" -X \"main.BuildDate=$(date --utc)\" -X \"main.BuildNumber=$CIRCLE_BUILD_NUM\" -X \"main.BuildCommit=$CIRCLE_SHA1\"" -v github.com/MeneDev/yubi-oath-vpn/cmd/yubi-oath-vpn
5654
- run:
57-
name: Build project for windows
55+
name: Build project for Windows
5856
command: |
5957
tag="$(semantics --output-tag --dry-run)"
6058
CGO_LDFLAGS_ALLOW='.*' CGO_CFLAGS_ALLOW='.*' CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CGO_ENABLED=1 GOOS=windows GOARCH=amd64 PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig go build -o release/windows/yubi-oath-vpn-win_amd64.exe -tags "glib_2_66" -ldflags="-s -w -X \"main.Version=${tag:-not a release}\" -X \"main.BuildDate=$(date --utc)\" -X \"main.BuildNumber=$CIRCLE_BUILD_NUM\" -X \"main.BuildCommit=$CIRCLE_SHA1\"" -v github.com/MeneDev/yubi-oath-vpn/cmd/yubi-oath-vpn

builder2/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ ENV GOPATH /go
2626
ENV GOCACHE /go/.cache
2727
ENV PATH "$PATH:$GOPATH/bin"
2828

29+
# hack, but currently don't bother how to properly setup go in current version
30+
RUN mkdir /go
31+
RUN chmod a+rwx /go
32+
2933
RUN go install github.com/tcnksm/ghr@v0.15.0
3034
RUN go install github.com/stevenmatthewt/semantics@latest
3135

0 commit comments

Comments
 (0)