Merge pull request #349 from go-vgo/bitmap-pr

Update README.md and Update Dockerfile and go.yml

.circleci/images/primary/Dockerfile

@@ -1,5 +1,5 @@
 # FROM golang:1.10.1
-FROM golang:1.16.6-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 \

.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

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

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

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