Skip to content

Commit

Permalink
chore: updated ci/cd, makefile devtools and docker file version
Browse files Browse the repository at this point in the history
  • Loading branch information
Ja7ad committed Sep 22, 2024
1 parent 873271e commit 240f0aa
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deadlock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Build the binary
run: make build_gui

- name: Installing golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.1

- name: Lint check
run: BUILD_TAG=gtk make check
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Build the binary
run: make build_gui
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_cli.sh
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_linux.sh
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_macos.sh
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_macos.sh
Expand Down Expand Up @@ -267,4 +267,4 @@ jobs:
with:
files: .github/releasers/pactus_downloader.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Unit tests
run: make unit_test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.2-alpine3.19 as builder
FROM golang:1.23.1-alpine3.19 as builder

RUN apk add --no-cache git gmp-dev build-base g++ openssl-dev
ADD . /pactus
Expand Down
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ all: build test
### Tools needed for development
devtools:
@echo "Installing devtools"
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.20
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.20
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.22
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.22
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4
go install github.com/NathanBaulch/protoc-gen-cobra@v1.2
go install github.com/pactus-project/protoc-gen-doc/cmd/protoc-gen-doc@v0.0.0-20240815105130-84e89d0170e4
go install github.com/bufbuild/buf/cmd/buf@v1.34
go install github.com/bufbuild/buf/cmd/buf@v1.42
go install mvdan.cc/gofumpt@latest
go install github.com/rakyll/statik@v0.1.7
go install github.com/pacviewer/jrpc-gateway/protoc-gen-jrpc-gateway@v0.3.2

########################################
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pactus-project/pactus

go 1.22.2
go 1.23.1

require (
github.com/NathanBaulch/protoc-gen-cobra v1.2.1
Expand Down Expand Up @@ -52,8 +52,8 @@ require (
github.com/chzyer/readline v1.5.1 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/creachadair/jrpc2 v1.2.0 // indirect
github.com/creachadair/mds v0.15.0 // indirect
github.com/creachadair/jrpc2 v1.2.1 // indirect
github.com/creachadair/mds v0.21.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creachadair/jrpc2 v1.2.0 h1:SXr0OgnwM0X18P+HccJP0uT3KGSDk/BCSRlJBvE2bMY=
github.com/creachadair/jrpc2 v1.2.0/go.mod h1:66uKSdr6tR5ZeNvkIjDSbbVUtOv0UhjS/vcd8ECP7Iw=
github.com/creachadair/mds v0.15.0 h1:St6HvUcrX1UJ517Zha6GKxVibGyRDBDtInOjuaaHOrQ=
github.com/creachadair/mds v0.15.0/go.mod h1:4vrFYUzTXMJpMBU+OA292I6IUxKWCCfZkgXg+/kBZMo=
github.com/creachadair/jrpc2 v1.2.1 h1:eIgmguoqLbEjn4Pb/XYMg5U1PhVpAClGdhI/Q4gfC5o=
github.com/creachadair/jrpc2 v1.2.1/go.mod h1:RvEKAYVpDBKn3YWlTVQJIFmxG5GuLD7ztp9FMTJx8eI=
github.com/creachadair/mds v0.21.2 h1:D5130qi/kqmu+gGUQyDNOhrocGQp075ziTCgttxhh3k=
github.com/creachadair/mds v0.21.2/go.mod h1:1ltMWZd9yXhaHEoZwBialMaviWVUpRPvMwVP7saFAzM=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
18 changes: 9 additions & 9 deletions www/grpc/gen/docs/json-rpc.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ parameters.</p>
</tr>
<tr>
<td class="fw-bold">verbosity</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The verbosity level for transaction details.
<br>Available values:<ul>
Expand Down Expand Up @@ -326,7 +326,7 @@ parameters.</p>
</tr>
<tr>
<td class="fw-bold">transaction.payload_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of transaction payload.
<br>Available values:<ul>
Expand Down Expand Up @@ -503,7 +503,7 @@ and payload type.</p>
</tr>
<tr>
<td class="fw-bold">payload_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of transaction payload.
<br>Available values:<ul>
Expand Down Expand Up @@ -889,7 +889,7 @@ parameters.</p>
</tr>
<tr>
<td class="fw-bold">verbosity</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The verbosity level for block information.
<br>Available values:<ul>
Expand Down Expand Up @@ -1072,7 +1072,7 @@ BLOCK_TRANSACTIONS.
</tr>
<tr>
<td class="fw-bold">txs[].payload_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of transaction payload.
<br>Available values:<ul>
Expand Down Expand Up @@ -1553,7 +1553,7 @@ committee.
</tr>
<tr>
<td class="fw-bold">instances[].votes[].type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of the vote.
<br>Available values:<ul>
Expand Down Expand Up @@ -1966,7 +1966,7 @@ address.</p>
<tbody class="table-group-divider">
<tr>
<td class="fw-bold">payload_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of transactions to retrieve from the transaction pool. 0 means all
types.
Expand Down Expand Up @@ -2040,7 +2040,7 @@ types.
</tr>
<tr>
<td class="fw-bold">txs[].payload_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of transaction payload.
<br>Available values:<ul>
Expand Down Expand Up @@ -2967,7 +2967,7 @@ public key.</p>
</tr>
<tr>
<td class="fw-bold">address_type</td>
<td> string</td>
<td> numeric</td>
<td>
(Enum) The type of address to generate.
<br>Available values:<ul>
Expand Down
3 changes: 2 additions & 1 deletion www/grpc/gen/go/blockchain.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion www/grpc/gen/go/network.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion www/grpc/gen/go/transaction.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion www/grpc/gen/go/utils.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion www/grpc/gen/go/wallet.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 240f0aa

Please sign in to comment.