From b57c40186d81fae882d2caee1440d4e644f82f79 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Sat, 7 Aug 2021 14:00:23 -0400 Subject: [PATCH 1/3] update dockerfile and appveyor.yml --- .circleci/images/primary/Dockerfile | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile index 25cebae..157b439 100644 --- a/.circleci/images/primary/Dockerfile +++ b/.circleci/images/primary/Dockerfile @@ -1,5 +1,5 @@ # FROM golang:1.10.1 -FROM golang:1.16.6-stretch AS build +FROM golang:1.16.7-stretch AS build # FROM govgo/go:1.11.1 RUN apt update && apt install -y --no-install-recommends \ diff --git a/appveyor.yml b/appveyor.yml index e7c71e3..fabe54a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ environment: PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH% # - COMPILER: MINGW_W64 # ARCHITECTURE: x64 - GOVERSION: 1.16.6 + GOVERSION: 1.16.7 # GOPATH: c:\gopath # scripts that run after cloning repository From 2daa5b775eeeb6da5c750911c19d115aa46aa406 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 17 Aug 2021 12:29:01 -0400 Subject: [PATCH 2/3] Update README.md --- README.md | 13 ++++++++----- README_zh.md | 13 ++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fa9aed5..d3eaad2 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ sudo apt install libxkbcommon-dev sudo apt install xsel xclip ``` -#### Fedora: +##### Fedora: ```yml sudo dnf install libxkbcommon-devel libXtst-devel libxkbcommon-x11-devel xorg-x11-xkb-utils-devel @@ -330,17 +330,20 @@ go build main.go ``` #### Other to windows -Install Requirements: + +##### Install Requirements (Ubuntu): ```bash -sudo apt-get install gcc-multilib -sudo apt-get install gcc-mingw-w64 +sudo apt install gcc-multilib +sudo apt install gcc-mingw-w64 # fix err: zlib.h: No such file or directory -sudo apt-get install libz-mingw-w64-dev +sudo apt install libz-mingw-w64-dev ``` + Build the binary: ```Go GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ go build -x ./ ``` + ``` // CC=mingw-w64\x86_64-7.2.0-win32-seh-rt_v5-rev1\mingw64\bin\gcc.exe // CXX=mingw-w64\x86_64-7.2.0-win32-seh-rt_v5-rev1\mingw64\bin\g++.exe diff --git a/README_zh.md b/README_zh.md index 760990b..8bba16b 100644 --- a/README_zh.md +++ b/README_zh.md @@ -88,7 +88,7 @@ sudo apt install xsel xclip ``` -#### Fedora: +##### Fedora: ```yml sudo dnf install libxkbcommon-devel libXtst-devel libxkbcommon-x11-devel xorg-x11-xkb-utils-devel @@ -327,9 +327,20 @@ go build main.go ``` #### Other to windows + +##### Install Requirements (Ubuntu): +```bash +sudo apt install gcc-multilib +sudo apt install gcc-mingw-w64 +sudo apt install libz-mingw-w64-dev +``` + +##### Build the binary: + ```Go GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ go build -x ./ ``` + ``` // CC=mingw-w64\x86_64-7.2.0-win32-seh-rt_v5-rev1\mingw64\bin\gcc.exe // CXX=mingw-w64\x86_64-7.2.0-win32-seh-rt_v5-rev1\mingw64\bin\g++.exe From 4fcd79c2084b289b6e74d6f96c168fca4a6be322 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 17 Aug 2021 12:32:26 -0400 Subject: [PATCH 3/3] Update Dockerfile and go.yml --- .circleci/images/primary/Dockerfile | 2 +- .github/workflows/go.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile index 157b439..353ff27 100644 --- a/.circleci/images/primary/Dockerfile +++ b/.circleci/images/primary/Dockerfile @@ -1,5 +1,5 @@ # FROM golang:1.10.1 -FROM golang:1.16.7-stretch AS build +FROM golang:1.7-stretch AS build # FROM govgo/go:1.11.1 RUN apt update && apt install -y --no-install-recommends \ diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b3fc8af..0f509b1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,10 +10,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory