Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BREAKING CHANGE/update kubo 0.29.0 #100

Merged
merged 20 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
uses: actions/[email protected]
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-

- name: Avoid triggering make generate
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
uses: actions/[email protected]
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-

- name: Check go.mod and go.sum
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
uses: actions/[email protected]
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-

- name: Check go.mod and go.sum
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
uses: actions/[email protected]
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-

- name: Check go.mod and go.sum
Expand Down
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
run:
deadline: 1m
tests: false
skip-files:
issues:
exclude-files:
- ".*\\.pb\\.go$"
- ".*\\.pb\\.gw\\.go$"
- ".*\\.gen\\.go$"
Expand Down Expand Up @@ -29,7 +30,7 @@ linters:
enable:
- asciicheck
- bodyclose
- depguard
#- depguard
- dogsled
- errcheck
#- exhaustive # nice to have
Expand Down Expand Up @@ -62,4 +63,3 @@ linters:
- unparam
- unused
- whitespace
- unused
15 changes: 4 additions & 11 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,12 @@
# major version of Go which is allowed by kubo.
# There is no contraindication for updating it.
#-----
golang 1.19.7
golang 1.22.5

#-----
# This is simply the most recent golangci-lint version available to date.
#
# @TODO(gfanton): check if we still have this issue
# The current version of golangci-lint also has a problem displaying logs on
# Github actions, see: https://github.com/golangci/golangci-lint-action/issues/119
#
# It would be good to update it (when possible) to a version that fixes this log
# issue and to update the golangci-lint Github Actions step accordingly.
#-----
golangci-lint 1.51.2
#-----
golangci-lint 1.59.1

#-----
# This is simply the most recent jq version available to date.
Expand All @@ -30,4 +23,4 @@ jq 1.6
# This is simply the most recent buf version available to date.
# There is no contraindication for updating it.
#-----
buf 1.15.1
buf 1.39.0
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ $(gen_sum): $(gen_src)
--workdir="/go/src/berty.tech/weshnet" \
--entrypoint="sh" \
--rm \
bertytech/buf:2 \
bertytech/buf:5 \
-xec 'make generate_local'; \
$(MAKE) tidy \
)
Expand All @@ -166,6 +166,8 @@ generate_local:
$(call check-program, shasum buf)
buf generate api/go-internal;
buf generate api/protocol;
buf generate --template buf.gen.tag.yaml api/go-internal;
buf generate --template buf.gen.tag.yaml api/protocol;
$(MAKE) go.fmt
shasum $(gen_src) | sort -k 2 > $(gen_sum).tmp
mv $(gen_sum).tmp $(gen_sum)
Expand Down
Loading
Loading