Skip to content

Commit

Permalink
fix(ci): fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Morelly committed Sep 26, 2023
1 parent f8193cf commit eb080a3
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: '1.17'
go-version: '1.19'
cache: false

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.50.0
version: v1.54.2
args: -c .golang-ci.yml -v --timeout=5m
env:
GO111MODULES: off
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
-
name: Set up Go
uses: actions/setup-go@v3
-
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version: '1.19'
cache: false
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,25 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
vault-version: [1.11-ent, 1.12-ent, latest]
# max-parallel: 1
max-parallel: 1

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: 1.17
go-version: '1.19'
cache: false

- name: go get
run: go get ./...

- name: go mod tidy
run: go mod tidy

- name: Run coverage
run: go test -v -race -coverprofile="coverage.out" -covermode=atomic ./...
env:
VAULT_VERSION: ${{ matrix.vault-version }}
VAULT_VERSION: latest
VAULT_LICENSE: ${{ secrets.VAULT_LICENSE }}

- name: Upload coverage to Codecov
Expand Down
5 changes: 4 additions & 1 deletion .golang-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@ linters:
- goimports
- gci
- gofmt
- gofumpt
- gofumpt
- revive
- depguard
- tagalign
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ repos:
rev: v1.0.0-rc.1
hooks:
- id: go-build-mod
- id: go-mod-tidy
- id: go-test-mod
- id: go-vet-mod
- id: go-staticcheck-mod
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/FalcoSuessgott/vkv

go 1.17
go 1.19

require (
github.com/disiqueira/gotree/v3 v3.0.2
Expand Down
3 changes: 1 addition & 2 deletions pkg/fs/fs.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package fs

import (
"io/ioutil"
"os"
)

// ReadFile reads from a file.
func ReadFile(path string) ([]byte, error) {
content, err := ioutil.ReadFile(path)
content, err := os.ReadFile(path)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit eb080a3

Please sign in to comment.