upgrade build and use go modules instead of dep

Author: lucebac

.circleci/config.yml

@@ -6,8 +6,6 @@ jobs:
       - checkout
       - restore_cache:
           key: builder-{{ checksum "builder2/Dockerfile" }}
-          paths:
-              - /tmp/docker_pushed
       - run:
           name: Build and push image if builder/Dockerfile has changed
           command:  |
@@ -30,30 +28,25 @@ jobs:
 
     working_directory: /go/src/github.com/MeneDev/yubi-oath-vpn
     environment:
-      - DEP_VERSION: 0.5.0
-      - GITHUB_USER: MeneDev
-      - GITHUB_PROJECT: yubi-oath-vpn
-      - GOCACHE: "/tmp/go/cache"
+      GITHUB_USER: MeneDev
+      GITHUB_PROJECT: yubi-oath-vpn
     steps:
       - checkout
       - restore_cache:
-          key: gopkg-linux-windows-{{ checksum "Gopkg.lock" }}
-          paths:
-              - /go/src/github.com/MeneDev/yubi-oath-vpn/vendor
-              - /tmp/go/cache
+          key: gopkg-linux-windows-{{ checksum "go.mod" }}
       - run:
           name: Download and build libraries
           command: |
             if [ ! -d ./vendor ]; then
-                /go/bin/dep ensure
+                go mod vendor
                 find vendor/ -maxdepth 3 -mindepth 3 -exec bash -c 'cd $0 && go build  ./...' {} \;
                 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 find vendor/ -maxdepth 3 -mindepth 3 -exec bash -c 'cd $0 && go build  ./...' {} \;
             fi
       - save_cache:
-          key: gopkg-linux-windows-{{ checksum "Gopkg.lock" }}
+          key: gopkg-linux-windows-{{ checksum "go.mod" }}
           paths:
               - ./vendor
-              - /tmp/go/cache
+              - /go/.cache
 
       - run:
           name: Build project for linux
@@ -68,7 +61,7 @@ jobs:
 
       - run: release/yubi-oath-vpn-linux_amd64 --version
 
-      - run: cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/{iconv.dll,libatk-1.0-0.dll,libbz2-1.dll,libcairo-2.dll,libcairo-gobject-2.dll,libepoxy-0.dll,libexpat-1.dll,libffi-6.dll,libfontconfig-1.dll,libfreetype-6.dll,libgcc_s_seh-1.dll,libgdk-3-0.dll,libgdk_pixbuf-2.0-0.dll,libgio-2.0-0.dll,libglib-2.0-0.dll,libgmodule-2.0-0.dll,libgobject-2.0-0.dll,libgtk-3-0.dll,libintl-8.dll,libpango-1.0-0.dll,libpangocairo-1.0-0.dll,libpangowin32-1.0-0.dll,libpcre-1.dll,libpixman-1-0.dll,libpng16-16.dll,libwinpthread-1.dll,zlib1.dll} release/windows
+      - run: cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/{iconv.dll,libatk-1.0-0.dll,libbz2-1.dll,libcairo-2.dll,libcairo-gobject-2.dll,libepoxy-0.dll,libexpat-1.dll,libffi-8.dll,libfontconfig-1.dll,libfreetype-6.dll,libgcc_s_seh-1.dll,libgdk-3-0.dll,libgdk_pixbuf-2.0-0.dll,libgio-2.0-0.dll,libglib-2.0-0.dll,libgmodule-2.0-0.dll,libgobject-2.0-0.dll,libgtk-3-0.dll,libintl-8.dll,libpango-1.0-0.dll,libpangocairo-1.0-0.dll,libpangowin32-1.0-0.dll,libpcre-1.dll,libpixman-1-0.dll,libpng16-16.dll,libwinpthread-1.dll,zlib1.dll} release/windows
 
       - run: find 3rd-party-licenses -mindepth 1 -exec basename {} .txt \; -exec echo  \; -exec cat {} \; -exec echo -e '\n\n\n\n' \; > release/3rd-party-licenses.txt
       - run: find 3rd-party-licenses -mindepth 1 -exec basename {} .txt \; -exec echo  \; -exec cat {} \; -exec echo -e '\n\n\n\n' \; > release/windows/3rd-party-licenses.txt

Dockerfile

@@ -1,16 +1,14 @@
-FROM menedev/yubi-oath-vpn-builder:latest
+# requires buildkit for caching; run: DOCKER_BUILDKIT=1 docker build -t yubi-oath-vpn .
 
-ENV GOCACHE=/tmp/go/cache
-RUN mkdir -p $GOCACHE
+FROM yubi-oath-vpn-builder:latest
 
-# build dependencies
+# download dependencies
 RUN mkdir -p /go/src/github.com/MeneDev/yubi-oath-vpn
 WORKDIR /go/src/github.com/MeneDev/yubi-oath-vpn
-COPY Gopkg.* ./
-RUN /go/bin/dep ensure --vendor-only
-RUN find vendor/ -maxdepth 3 -mindepth 3 -exec bash -c 'cd $0 && go build -v ./...' {} \;
+COPY go.* ./
+RUN go mod download
 
 # build project
-COPY *.go ./
-RUN CIRCLE_BUILD_NUM=build123 CIRCLE_SHA1=aabbccddeeff gox -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\"" -os="linux" -arch="amd64" -output "release/yubi-oath-vpn-{{.OS}}_{{.Arch}}"
-RUN release/yubi-oath-vpn-linux_amd64 --version
+COPY . ./
+RUN --mount=type=cache,target=/go/.cache CIRCLE_BUILD_NUM=build123 CIRCLE_SHA1=aabbccddeeff go build -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\"" -o yubi-oath-vpn-linux_amd64 ./cmd/yubi-oath-vpn/
+ENTRYPOINT ["./yubi-oath-vpn-linux_amd64"]

Gopkg.lock

@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:36
 
 RUN dnf install -y \
         findutils \
@@ -7,33 +7,27 @@ RUN dnf install -y \
         gtk3-devel \
         libudev-devel \
         libusbx-devel \
-        mingw32-gcc mingw64-gcc \
+        mingw32-gcc \
+        mingw64-gcc \
         mingw32-gcc-c++ \
         mingw32-glib2 \
         mingw32-gtk3 \
+        mingw32-libusbx \
         mingw64-gcc-c++ \
         mingw64-glib2 \
         mingw64-gtk3 \
+        mingw64-libusbx \
         pcsc-lite-devel \
         zip \
         && \
         dnf clean all
 
-RUN mkdir /go
-RUN mkdir /go/bin
 ENV GOPATH /go
+ENV GOCACHE /go/.cache
 ENV PATH "$PATH:$GOPATH/bin"
 
-RUN curl -sL https://github.com/tcnksm/ghr/releases/download/v0.15.0/ghr_v0.15.0_linux_amd64.tar.gz | tar -xz  --strip-components=1 --directory "$GOPATH/bin" ghr_v0.15.0_linux_amd64/ghr
-RUN go get -u github.com/stevenmatthewt/semantics
-
-RUN curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o /go/bin/dep \
-    && chmod +x /go/bin/dep
-
-RUN mkdir -p /go/src/github.com/mitchellh/gox
-RUN git clone --branch master https://github.com/mitchellh/gox.git /go/src/github.com/mitchellh/gox
-RUN cd /go/src/github.com/mitchellh/gox && git reset --hard 9cc487598128d0963ff9dcc51176e722788ec645
-RUN cd /go/src/github.com/mitchellh/gox && dep ensure && go install -v ./...
+RUN go install github.com/tcnksm/ghr@v0.15.0 
+RUN go install github.com/stevenmatthewt/semantics@latest
 
 # 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 -v github.com/MeneDev/yubi-oath-vpn/cmd/yubi-oath-vpn
-# cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/{libatk-1.0-0.dll,libbz2-1.dll,libcairo-2.dll,libcairo-gobject-2.dll,libepoxy-0.dll,libexpat-1.dll,libffi-6.dll,libfontconfig-1.dll,libfreetype-6.dll,libgcc_s_seh-1.dll,libgdk-3-0.dll,libgdk_pixbuf-2.0-0.dll,libgio-2.0-0.dll,libgit2.dll,libglib-2.0-0.dll,libgmodule-2.0-0.dll,libgobject-2.0-0.dll,libgraphite2.dll,libgtk-3-0.dll,libharfbuzz-0.dll,libiconv-2.dll,libintl-8.dll,libjasper-1.dll,libjpeg-8.dll,libpango-1.0-0.dll,libpangocairo-1.0-0.dll,libpangoft2-1.0-0.dll,libpangowin32-1.0-0.dll,libpcre-1.dll,libpixman-1-0.dll,libpng16-16.dll,libstdc++-6.dll,libwinpthread-1.dll,zlib1.dll} /go/src/github.com/MeneDev/yubi-oath-vpn/release
+# cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/{libatk-1.0-0.dll,libbz2-1.dll,libcairo-2.dll,libcairo-gobject-2.dll,libepoxy-0.dll,libexpat-1.dll,libffi-6.dll,libfontconfig-1.dll,libfreetype-6.dll,libgcc_s_seh-1.dll,libgdk-3-0.dll,libgdk_pixbuf-2.0-0.dll,libgio-2.0-0.dll,libgit2.dll,libglib-2.0-0.dll,libgmodule-2.0-0.dll,libgobject-2.0-0.dll,libgraphite2.dll,libgtk-3-0.dll,libharfbuzz-0.dll,libiconv-2.dll,libintl-8.dll,libjasper-1.dll,libjpeg-8.dll,libpango-1.0-0.dll,libpangocairo-1.0-0.dll,libpangoft2-1.0-0.dll,libpangowin32-1.0-0.dll,libpcre-1.dll,libpixman-1-0.dll,libpng16-16.dll,libstdc++-6.dll,libwinpthread-1.dll,zlib1.dll} /go/src/github.com/MeneDev/yubi-oath-vpn/release