diff --git a/builder/Dockerfile b/builder/Dockerfile deleted file mode 100644 index cd31a07..0000000 --- a/builder/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM circleci/golang:1.11.2 - -RUN sudo apt-get update && sudo apt-get install -y \ - libgtk-3-dev \ - libpcsclite-dev \ - libudev-dev \ - libusb-1.0-0-dev \ -&& sudo rm -rf /var/lib/apt/lists/* - -RUN go get -u github.com/tcnksm/ghr \ - && 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 ./... diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 1a6961c..f15692e 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -1,9 +1,9 @@ -FROM fedora:36 +FROM fedora:42 RUN dnf install -y \ findutils \ git \ - golang \ + golang-1.24.5 \ gtk3-devel \ libudev-devel \ libusbx-devel \ @@ -22,16 +22,16 @@ RUN dnf install -y \ && \ dnf clean all -ENV GOPATH /go -ENV GOCACHE /go/.cache -ENV PATH "$PATH:$GOPATH/bin" +ENV GOPATH=/go +ENV GOCACHE=/go/.cache +ENV PATH="$PATH:$GOPATH/bin" # hack, but currently don't bother how to properly setup go in current version RUN mkdir /go RUN chmod a+rwx /go -RUN go install github.com/tcnksm/ghr@v0.15.0 -RUN go install github.com/stevenmatthewt/semantics@latest +RUN go install github.com/tcnksm/ghr@v0.17.0 +RUN go install github.com/stevenmatthewt/semantics@v2.0.4 # 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 diff --git a/go.mod b/go.mod index 144122b..595e32c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/MeneDev/yubi-oath-vpn -go 1.19 +go 1.24 require ( github.com/ebfe/scard v0.0.0-20190212122703-c3d1b1916a95