Skip to content

Commit

Permalink
Support Go 1.16 (#41)
Browse files Browse the repository at this point in the history 
* support Go 1.16

* let's try unpinning the lint action version

* update docs gemfile and htmltest

* upgrade asc-go and other deps
  • Loading branch information
@aaronsky
aaronsky authored Feb 26, 2021
1 parent 8b746fa commit 2d69e34
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 118 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: actions/setup-go@v1
with:
go-version: 1.15.x
go-version: '1.16'

- name: Cache Go Modules
uses: actions/cache@v2
Expand All @@ -53,10 +53,15 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v1
with:
go-version: '1.16'

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@master
with:
version: v1.35
version: v1.37
skip-go-installation: true

verify_doc_tools:
name: verify doc tools
Expand All @@ -66,7 +71,7 @@ jobs:

- uses: actions/setup-go@v1
with:
go-version: 1.15.x
go-version: '1.16'

- name: Run gendoc tool
run: go run ./tools/gendoc
Expand All @@ -91,7 +96,7 @@ jobs:

- uses: actions/setup-go@v1
with:
go-version: 1.15.x
go-version: '1.16'

- name: Login to Docker Hub
run: |
Expand Down
14 changes: 8 additions & 6 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ issues:
linters:
enable-all: true
disable:
- lll
- cyclop
- exhaustivestruct
- forbidigo
- funlen
- gofumpt
- gci
- gofumpt
- ifshort
- lll
- nlreturn
- testpackage
- exhaustivestruct
- wrapcheck
- paralleltest
- forbidigo
- testpackage
- thelper
- wrapcheck
4 changes: 2 additions & 2 deletions docs/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ source "https://rubygems.org"

git_source(:github) {|repo_name| "/~https://github.com/#{repo_name}" }

gem "github-pages", "~> 207", group: :jekyll_plugins
gem "jekyll-seo-tag", "~> 2.6"
gem "github-pages", "~> 212", group: :jekyll_plugins
gem "jekyll-seo-tag", "~> 2.7"
gem "just-the-docs"
93 changes: 50 additions & 43 deletions docs/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.2)
activesupport (6.0.3.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -16,46 +16,49 @@ GEM
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.7)
dnsruby (1.61.4)
concurrent-ruby (1.1.8)
dnsruby (1.61.5)
simpleidn (~> 0.1)
em-websocket (0.5.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (1.0.1)
faraday (1.3.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ffi (1.13.1)
ruby2_keywords
faraday-net_http (1.0.1)
ffi (1.14.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (207)
github-pages-health-check (= 1.16.1)
github-pages (212)
github-pages-health-check (= 1.17.0)
jekyll (= 3.9.0)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.6)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.13.0)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.13.0)
jekyll-mentions (= 1.5.1)
jekyll-mentions (= 1.6.0)
jekyll-optional-front-matter (= 0.3.2)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.3.0)
jekyll-redirect-from (= 0.15.0)
jekyll-redirect-from (= 0.16.0)
jekyll-relative-links (= 0.6.1)
jekyll-remote-theme (= 0.4.1)
jekyll-remote-theme (= 0.4.2)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.6.1)
jekyll-seo-tag (= 2.7.1)
jekyll-sitemap (= 1.4.0)
jekyll-swiss (= 1.0.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.1)
jekyll-theme-hacker (= 0.1.2)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
Expand All @@ -66,20 +69,20 @@ GEM
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.3)
jemoji (= 0.11.1)
jemoji (= 0.12.0)
kramdown (= 2.3.0)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.3)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.10.4, < 2.0)
rouge (= 3.19.0)
rouge (= 3.26.0)
terminal-table (~> 1.4)
github-pages-health-check (1.16.1)
github-pages-health-check (1.17.0)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (~> 3.0)
public_suffix (>= 2.0.2, < 5.0)
typhoeus (~> 1.3)
html-pipeline (2.14.0)
activesupport (>= 2)
Expand Down Expand Up @@ -114,33 +117,34 @@ GEM
rouge (>= 2.0, < 4.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.13.0)
jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.5.1)
jekyll-mentions (1.6.0)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-optional-front-matter (0.3.2)
jekyll (>= 3.0, < 5.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.3.0)
jekyll (>= 3.0, < 5.0)
jekyll-redirect-from (0.15.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-remote-theme (0.4.1)
jekyll-remote-theme (0.4.2)
addressable (~> 2.0)
jekyll (>= 3.5, < 5.0)
rubyzip (>= 1.3.0)
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
rubyzip (>= 1.3.0, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-seo-tag (2.7.1)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-swiss (1.0.0)
Expand All @@ -153,8 +157,8 @@ GEM
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.1)
jekyll (~> 3.5)
jekyll-theme-hacker (0.1.2)
jekyll (> 3.5, < 5.0)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
Expand Down Expand Up @@ -188,11 +192,11 @@ GEM
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.11.1)
jemoji (0.12.0)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
just-the-docs (0.3.1)
just-the-docs (0.3.3)
jekyll (>= 3.8.5)
jekyll-seo-tag (~> 2.0)
rake (>= 12.3.1, < 13.1.0)
Expand All @@ -201,7 +205,7 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.2.1)
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
Expand All @@ -210,26 +214,29 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.14.2)
minitest (5.14.4)
multipart-post (2.1.1)
nokogiri (1.11.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.18.0)
nokogiri (1.11.1-x86_64-linux)
racc (~> 1.4)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
public_suffix (4.0.6)
racc (1.5.2)
rake (13.0.1)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.19.0)
ruby-enum (0.8.0)
rouge (3.26.0)
ruby-enum (0.9.0)
i18n
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
Expand All @@ -240,28 +247,28 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
simpleidn (0.1.1)
simpleidn (0.2.1)
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby

DEPENDENCIES
github-pages (~> 207)
jekyll-seo-tag (~> 2.6)
github-pages (~> 212)
jekyll-seo-tag (~> 2.7)
just-the-docs

BUNDLED WITH
2.1.4
2.2.2
1 change: 1 addition & 0 deletions docs/htmltest.yml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DirectoryPath: _site
IgnoreInternalEmptyHash: true
IgnoreSSLVerify: true
4 changes: 2 additions & 2 deletions docs/install.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ Download the specific version for your platform on Cider's [releases page](https
```shell
git clone git@github.com:cidertool/cider.git
cd cider
go build -o cider .
go build -o cider ./cmd/cider
```

From there, you can use your locally-built Cider binary for whatever purposes you need.
From there, you can use your locally-built Cider binary for whatever purposes you need. Cider requires **Go 1.16 or higher** to be installed.

## Missing your favorite?

Expand Down
16 changes: 8 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/cidertool/cider

go 1.15
go 1.16

require (
github.com/Masterminds/semver/v3 v3.1.0
github.com/alessio/shellescape v1.3.1
github.com/Masterminds/semver/v3 v3.1.1
github.com/alessio/shellescape v1.4.1
github.com/apex/log v1.9.0
github.com/cidertool/asc-go v0.4.1
github.com/cidertool/asc-go v0.5.0
github.com/fatih/color v1.10.0
github.com/hashicorp/go-multierror v1.1.0
github.com/manifoldco/promptui v0.8.0
github.com/spf13/cobra v1.1.1
github.com/stretchr/testify v1.6.1
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
gopkg.in/yaml.v2 v2.3.0
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
gopkg.in/yaml.v2 v2.4.0
)
Loading

0 comments on commit 2d69e34

Please sign in to comment.