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

chore: Backport changes from main to release v0.6.x maintenance branch #488

Merged
merged 38 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
24ca4c6
fix(installer): Backport to v0.6.x release branch (#379)
ankurdotb Aug 22, 2022
60cf85a
dragonberry
faddat Oct 16, 2022
8d7c5fb
dragonberry
faddat Oct 16, 2022
d9bcd83
build: Backport workflow and other fixes to release/0.6.x branch [DEV…
ankurdotb Oct 16, 2022
33b1ad0
Merge branch 'dragonberry-fix' into dragonberry
ankurdotb Oct 17, 2022
0c33fb6
fix: dragonberry (#409)
ankurdotb Oct 17, 2022
b1d3d06
Bump version of cosmos sdk
Oct 17, 2022
0c6fd1a
Go mod tidy
askolesov Oct 17, 2022
92b9ac6
Switch back to cheqd cosmos fork
askolesov Oct 17, 2022
f49e465
Fix build
askolesov Oct 17, 2022
3bdec19
Bump dockerfile go v1.18
Eengineer1 Oct 17, 2022
3f1234b
Added recommended patch changes
Eengineer1 Oct 17, 2022
f94f029
Update configure.go
askolesov Oct 17, 2022
57d2746
Woraround for Tendermint's defaut storage config
askolesov Oct 17, 2022
d788e5c
Fix dockerfile
askolesov Oct 17, 2022
0a6c992
Remove .dockerignore
askolesov Oct 17, 2022
f76be20
Fix cosmos deafult config
askolesov Oct 17, 2022
2f8949f
fix(security): Bump version of cosmos sdk (#413)
askolesov Oct 17, 2022
49639bf
Merge branch 'release/0.6.x' into dragonberry-fix
ankurdotb Oct 17, 2022
8a1444b
Create .dockerignore
ankurdotb Oct 17, 2022
70fd28c
Revert copy stage changes
ankurdotb Oct 17, 2022
c3cba9d
Bump golang CI linter to 1.18
ankurdotb Oct 17, 2022
52357a4
Bump CodeQL to 1.18
ankurdotb Oct 17, 2022
fd4cc8d
ci(docker): Docker build for Dragonberry patch [DEV-1824] (#411)
ankurdotb Oct 17, 2022
638dfbd
ci: Sync tag version format
ankurdotb Oct 28, 2022
9e7f7ff
Squashed commit of the following:
ankurdotb Aug 16, 2022
d40b0eb
chore(deps): Bump goreleaser/goreleaser-action from 3 to 4 (#486)
dependabot[bot] Dec 20, 2022
65a54f7
chore(deps): Bump bufbuild/buf-setup-action from 1.8.0 to 1.10.0 (#477)
dependabot[bot] Dec 13, 2022
475a823
ci: Update PR title check (#463)
ankurdotb Dec 2, 2022
73a8d89
fix: Error handling (#425)
askolesov Oct 26, 2022
c2ba088
Update go.mod
ankurdotb Dec 20, 2022
3709239
Bump package
ankurdotb Dec 20, 2022
622fce9
Fix broken link
ankurdotb Dec 20, 2022
1ca771d
Fix protobuf breaking reference
ankurdotb Dec 20, 2022
5fc3883
Deactivate protobuf workflows
ankurdotb Dec 20, 2022
771e75d
Change build runners
ankurdotb Dec 20, 2022
48ea82d
Don't wrap release
ankurdotb Dec 20, 2022
92ba678
Update Dockerfile
ankurdotb Dec 20, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

build-binary:
name: "Node binary"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand All @@ -24,7 +24,7 @@ jobs:
cache: true

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3
uses: goreleaser/goreleaser-action@v4
with:
distribution: goreleaser
version: latest
Expand All @@ -38,7 +38,7 @@ jobs:

build-docker:
name: "Docker image"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
IMAGE_NAME: ${{ github.repository }}

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
outputs: type=docker,dest=/tmp/cheqd-node-build.tar
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min

- name: Upload Docker build image
uses: actions/upload-artifact@v3
Expand Down
29 changes: 24 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

sh-euox-pipefail-check:
name: "Shell pipefail check"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand All @@ -20,7 +20,7 @@ jobs:

md-link-check:
name: "Broken Markdown links"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:
# We can't use VALIDATE_GO from super linter because of this issue:
# https://github.com/github/super-linter/issues/143
name: "Golang"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand All @@ -51,15 +51,34 @@ jobs:
version: v1.47
args: --config .github/linters/.golangci.yaml

# proto-lint:
# name: "Protobuf"
# runs-on: ubuntu-20.04
# steps:
# - uses: actions/checkout@v3

# # Install the `buf` CLI
# - uses: bufbuild/buf-setup-action@v1.10.0

# # Lint
# - uses: bufbuild/buf-lint-action@v1

# # Breaking change detection
# - uses: bufbuild/buf-breaking-action@v1
# continue-on-error: true
# with:
# input: 'proto'
# against: 'https://github.com/cheqd/cheqd-node.git#branch=release/0.6.x,ref=HEAD~1,subdir=proto'

super-lint:
name: "Super Linter"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Required to fetch version

- name: Run Super Linter
uses: github/super-linter/slim@v4
env:
Expand Down
28 changes: 21 additions & 7 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,29 @@ jobs:
lint-pr:
name: "PR format check"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
# check for the most recent release: https://github.com/CondeNast/conventional-pull-request-action/releases
# replace vX.X.X below with the most recently released version
- uses: CondeNast/conventional-pull-request-action@v0.1.2

- uses: amannn/action-semantic-pull-request@v5.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# to override config-conventional rules, specify a relative path to your rules module, actions/checkout is required for this setting!
commitlintRulesPath: "./.github/linters/.commitlint.rules.js" # default: undefined
# if the PR contains a single commit, fail if the commit message and the PR title do not match
commitTitleMatch: "false" # default: 'true'
# Configure which types are allowed (newline delimited).
# Default: https://github.com/commitizen/conventional-commit-types
types: |
feat
fix
build
chore
ci
docs
feat
fix
perf
refactor
revert
style
test
# Configure that a scope must always be provided.
requireScope: false
21 changes: 10 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

release-binary:
name: "Node binary"
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
RELEASE_VERSION: ${{ steps.set-version.outputs.RELEASE_VERSION }}

Expand All @@ -31,17 +31,17 @@ jobs:
# Node.js setup is needed to run Semantic Release
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

# Setup for pushing to Buf.build later
- uses: bufbuild/buf-setup-action@v1.8.0
- uses: bufbuild/buf-setup-action@v1.10.0

# Required for short-lived token provided to Semantic Release
- name: "Obtain Github App token"
id: app-token
uses: getsentry/action-github-app-token@v1.0.6
uses: getsentry/action-github-app-token@v2.0.0
with:
app_id: ${{ secrets.BOT_APP_ID }}
private_key: ${{ secrets.BOT_APP_PRIVATE_KEY }}
Expand Down Expand Up @@ -70,22 +70,21 @@ jobs:
echo ::set-output name=RELEASE_VERSION::"$RELEASE_VERSION"

# Push Protobufs to Buf.build registry
- uses: bufbuild/buf-push-action@v1
with:
input: proto
buf_token: ${{ secrets.BUF_TOKEN }}
# - uses: bufbuild/buf-push-action@v1
# with:
# input: proto
# buf_token: ${{ secrets.BUF_TOKEN }}

release-docker:
name: "Docker image"
needs: release-binary
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
IMAGE_NAME: ${{ github.repository }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Required to fetch version
persist-credentials: false

- name: Set up Docker Buildx
Expand Down Expand Up @@ -127,4 +126,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
5 changes: 1 addition & 4 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,8 @@ archives:
linux: Linux
amd64: x86_64
format: tar.gz
wrap_in_directory: true
wrap_in_directory: false
name_template: "{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
files:
- LICENSE
- README.md

checksum:
algorithm: sha256
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Once installed, `cheqd-node` can be controlled using the [cheqd Cosmos CLI guide

### 🔮 Upcoming functionality

The [cheqd product roadmap](https://product.cheqd.io/updates/roadmap) describes in detail functionality that is being considered / in-development for future releases. A non-exhaustive list (not necessarily in order of priority) is:
The [cheqd product roadmap](https://product.cheqd.io/product-essentials/roadmap) describes in detail functionality that is being considered / in-development for future releases. A non-exhaustive list (not necessarily in order of priority) is:

* Revocation registry/list support to revoke issued credentials
* Support for [AnonCreds](https://anoncreds-wg.github.io/anoncreds-spec/)
Expand Down
4 changes: 1 addition & 3 deletions cmd/cheqd-noded/cmd/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ func readCosmConfig(homeDir string) (cosmcfg.Config, error) {
return cosmcfg.Config{}, fmt.Errorf("failed to read in app.toml: %w", err)
}

config, _ := cosmcfg.GetConfig(v)

return config, nil
return cosmcfg.GetConfig(v)
}

func writeCosmConfig(homeDir string, config *cosmcfg.Config) {
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN make build
### STAGE 2: Build cheqd-node image ###
###############################################################

FROM alpine:3.16 AS runner
FROM alpine:3.17 AS runner

# Install pre-requisites
RUN apk update && apk add --no-cache bash ca-certificates
Expand Down
Loading