Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/custom-proto-path
Browse files Browse the repository at this point in the history
  • Loading branch information
Pantani authored and Pantani committed Apr 18, 2024
2 parents 9118645 + 47fe063 commit a180ec9
Show file tree
Hide file tree
Showing 19 changed files with 70 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4

- name: Cache node_modules
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:

build_and_deploy:
runs-on: ubuntu-latest
needs: [consecutiveness]
needs: [ consecutiveness ]

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node_modules
uses: actions/cache@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gen-docs-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ jobs:
cli:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: 'stable'

- name: Generate CLI Docs
run: ./scripts/gen-cli-docs

- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v6
with:
title: "docs(cli): update generated docs"
commit-message: "docs(cli): update generated docs"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gen-docs-version.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Docusaurus add version
on:
release:
types: [published]
types: [ published ]

jobs:
gen-docs-version:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node_modules
uses: actions/cache@v3
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
working-directory: ./docs

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
title: "chore: docusaurus deploy version ${{ github.ref_name }}"
commit-message: "chore(docs): deploy version ${{ github.ref_name }}"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/go-formatting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Go formatting
on:
push:
branches: [main]
branches: [ main ]
paths:
- '**.go'

Expand All @@ -10,18 +10,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: 'stable'

- name: Run make format
run: make format

- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v6
with:
title: "chore: go formatting"
commit-message: "chore: go formatting"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/md-link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v4
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: bufbuild/[email protected]
- uses: bufbuild/buf-lint-action@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release Binaries

on:
release:
types: [published]
types: [ published ]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -16,12 +16,12 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: 'stable'

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.working-directory }}
fetch-depth: 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release Docker Image

on:
release:
types: [published]
types: [ published ]
schedule:
- cron: "0 0 * * *" # every day at midnight

Expand Down Expand Up @@ -34,11 +34,11 @@ jobs:
name: Push Docker image to Docker Hub
if: needs.check-latest-run.outputs.last_sha != github.sha
runs-on: ubuntu-latest
needs: [consecutiveness, check-latest-run]
needs: [ consecutiveness, check-latest-run ]

steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:
release-nightly:
if: needs.check-latest-run.outputs.last_sha != github.sha
runs-on: ubuntu-latest
needs: [consecutiveness, check-latest-run]
needs: [ consecutiveness, check-latest-run ]
env:
working-directory: go/src/github.com/ignite/cli

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Delete the nightly release
uses: dev-drprasad/[email protected]
Expand Down Expand Up @@ -65,14 +65,14 @@ jobs:
releases-binaries:
if: needs.check-latest-run.outputs.last_sha != github.sha
name: Release Go Binary
needs: [consecutiveness, check-latest-run]
needs: [ consecutiveness, check-latest-run ]
runs-on: ubuntu-latest
strategy:
matrix:
goos: [linux, darwin]
goarch: [amd64, arm64]
goos: [ linux, darwin ]
goarch: [ amd64, arm64 ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: wangyoucao577/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-snapcraft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish Ignite to Snapcraft

on:
release:
types: [published]
types: [ published ]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -14,9 +14,9 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: 'stable'

- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v4
- name: Finding files and store to output
id: set-matrix
run: echo "matrix=$({ cd integration && find . -type d ! -name testdata -maxdepth 1 -print; } | tail -n +2 | cut -c 3- | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
Expand All @@ -33,10 +33,10 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, macos-latest]
os: [ ubuntu-latest, macos-latest ]
test-path: ${{fromJson(needs.pre-test.outputs.matrix)}}
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v4
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand All @@ -47,7 +47,7 @@ jobs:
go.sum
**/testdata/**
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: 'stable'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 6
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v4
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand All @@ -28,13 +28,13 @@ jobs:
go.mod
go.sum
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version-file: go.mod
cache: false

- uses: golangci/golangci-lint-action@v3
- uses: golangci/golangci-lint-action@v4
if: env.GIT_DIFF
with:
version: v1.54.2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ ubuntu-latest, macos-latest ]
steps:
- uses: actions/checkout@v4
- uses: technote-space/[email protected]
Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.22"
go-version: 'stable'
cache: true
cache-dependency-path: go.sum

Expand Down
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

- [#3969](https://github.com/ignite/cli/pull/3969) Get first config validator using a getter to avoid index errors
- [#4000](https://github.com/ignite/cli/pull/4000) Run all dry runners before the wet run in the `xgenny` pkg
- [#4086](https://github.com/ignite/cli/pull/4086) Retry to get the IBC balance if it fails the first time

## [`v28.3.0`](https://github.com/ignite/cli/releases/tag/v28.3.0)

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/08-references/01-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Ignite CLI offers everything you need to scaffold, test, build, and launch your

**Synopsis**

Ignite CLI is a tool for creating sovereign blockchains built with Cosmos SDK, the worlds
Ignite CLI is a tool for creating sovereign blockchains built with Cosmos SDK, the world's
most popular modular blockchain framework. Ignite CLI offers everything you need to scaffold,
test, build, and launch your blockchain.

Expand Down
19 changes: 13 additions & 6 deletions ignite/internal/tools/gen-cli-docs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"bufio"
"bytes"
"context"
"flag"
"fmt"
"io"
"log"
Expand All @@ -23,24 +22,25 @@ import (
"github.com/ignite/cli/v29/ignite/services/plugin"
)

const head = `---
const (
head = `---
description: Ignite CLI docs.
---
# CLI commands
Documentation for Ignite CLI.
`
outFlag = "out"
)

func main() {
outPath := flag.String("out", ".", ".md file path to place Ignite CLI docs inside")
flag.Parse()
if err := run(*outPath); err != nil {
if err := run(); err != nil {
log.Fatal(err)
}
}

func run(outPath string) error {
func run() error {
// We want to have documentation for commands that are implemented in plugins.
// To do that, we need to add the related plugins in the config.
// To avoid conflicts with user config, set an alternate config dir in tmp.
Expand Down Expand Up @@ -71,13 +71,20 @@ func run(outPath string) error {
return err
}
defer cleanUp()
cmd.Flags().String(outFlag, ".", ".md file path to place Ignite CLI docs inside")
cmd.Flags().MarkHidden(outFlag)

// Run ExecuteC so cobra adds the completion command.
cmd, err = cmd.ExecuteC()
if err != nil {
return err
}

outPath, err := cmd.Flags().GetString(outFlag)
if err != nil {
return nil
}

return generate(cmd, outPath)
}

Expand Down
2 changes: 1 addition & 1 deletion ignite/templates/app/files/.github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit a180ec9

Please sign in to comment.