Skip to content

Commit

Permalink
Merge branch 'main' into duong/in-place-testnet
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Sep 3, 2024
2 parents 67dd7f1 + 35b9a26 commit 66e4032
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 32 deletions.
1 change: 0 additions & 1 deletion .github/workflows/md-link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: gaurav-nelson/[email protected]
if: env.GIT_DIFF
with:
folder-path: "."
use-verbose-mode: "yes"
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/test-cov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Test Coverage

on:
schedule:
- cron: "0 0 * * *" # every day at midnight

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
test:
runs-on: $ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: main # change in release branches

- uses: actions/setup-go@v5
with:
go-version: "stable"

- run: ./scripts/test-coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
file: ./coverage.txt
fail_ci_if_error: false
verbose: true
2 changes: 0 additions & 2 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ jobs:
- uses: actions/checkout@v4

- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "stable"

- name: Run Integration Tests
if: env.GIT_DIFF
env:
GOTOOLCHAIN: local+path
GOSUMDB: off
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ jobs:
- uses: actions/checkout@v4

- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version-file: go.mod
cache: false

- uses: golangci/golangci-lint-action@v6
if: env.GIT_DIFF
with:
version: v1.60.3
install-mode: goinstall
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,7 @@ jobs:
- uses: actions/checkout@v4

- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "stable"
cache: true
cache-dependency-path: go.sum

- run: ./scripts/test-coverage
if: env.GIT_DIFF

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
if: env.GIT_DIFF
with:
file: ./coverage.txt
fail_ci_if_error: false
verbose: true
- run: ./scripts/test
5 changes: 4 additions & 1 deletion ignite/cmd/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ func assertFlags(t *testing.T, expectedFlags plugin.Flags, execCmd *plugin.Execu
}

func TestLinkPluginCmds(t *testing.T) {
t.Skip("passes locally and with act, but fails in CI")

var (
args = []string{"arg1", "arg2"}
pluginParams = map[string]string{"key": "val"}
Expand Down Expand Up @@ -417,6 +419,8 @@ func dumpCmd(c *cobra.Command, w io.Writer, ntabs int) {
}

func TestLinkPluginHooks(t *testing.T) {
t.Skip("passes locally and with act, but fails in CI")

var (
args = []string{"arg1", "arg2"}
pluginParams = map[string]string{"key": "val"}
Expand Down Expand Up @@ -613,7 +617,6 @@ func TestLinkPluginHooks(t *testing.T) {
defer cancel()

require := require.New(t)
// assert := assert.New(t)
pi := mocks.NewPluginInterface(t)
p := &plugin.Plugin{
Plugin: pluginsconfig.Plugin{
Expand Down
2 changes: 2 additions & 0 deletions ignite/internal/plugin/testdata/execute_fail/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ require (
github.com/gobuffalo/plush/v4 v4.1.19 // indirect
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-yaml v1.11.3 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -66,6 +67,7 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.14.0 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions ignite/internal/plugin/testdata/execute_ok/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ require (
github.com/gobuffalo/plush/v4 v4.1.19 // indirect
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-yaml v1.11.3 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -66,6 +67,7 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.14.0 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
Expand Down
5 changes: 3 additions & 2 deletions integration/plugin/testdata/example-plugin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ require (
github.com/gobuffalo/plush/v4 v4.1.19 // indirect
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-yaml v1.11.3 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -64,6 +65,7 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
Expand All @@ -78,7 +80,6 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.etcd.io/bbolt v1.3.9 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
Expand All @@ -91,7 +92,7 @@ require (
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/ignite/cli/v29 => ../../../../
4 changes: 4 additions & 0 deletions scripts/test
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
set -e -x

go test -race $(go list github.com/ignite/cli/v29/ignite/...)
11 changes: 0 additions & 11 deletions scripts/test-vue

This file was deleted.

0 comments on commit 66e4032

Please sign in to comment.