From 5edef43f8a2eb4cce9b80b823e15c2080bd28d7f Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 21 Sep 2022 23:50:48 +0200 Subject: [PATCH] implement feedback --- .github/workflows/test-e2e.yml | 3 +-- .github/workflows/test-integration.yml | 3 +-- .github/workflows/test-legacy.yml | 4 ++-- .github/workflows/test.yml | 1 - Makefile | 6 +++++- tests/Makefile | 2 -- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 2ae5b4cff4e..c4ce1494494 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -20,7 +20,6 @@ permissions: jobs: test-e2e: runs-on: ubuntu-latest - needs: build steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 @@ -28,4 +27,4 @@ jobs: go-version: 1.18 - name: e2e tests run: | - cd tests && make test-e2e + make test-e2e diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index f334408aea1..025855b92fb 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -20,7 +20,6 @@ permissions: jobs: test-integration: runs-on: ubuntu-latest - needs: build steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 @@ -28,4 +27,4 @@ jobs: go-version: 1.18 - name: integration tests run: | - cd tests && make test-integration + make test-integration diff --git a/.github/workflows/test-legacy.yml b/.github/workflows/test-legacy.yml index e92b8fa4b3c..be55d766535 100644 --- a/.github/workflows/test-legacy.yml +++ b/.github/workflows/test-legacy.yml @@ -76,7 +76,7 @@ jobs: path: ./${{ matrix.part }}profile.out sims-notify-success: - needs: [tests] + needs: tests runs-on: ubuntu-latest if: ${{ success() }} steps: @@ -102,7 +102,7 @@ jobs: SLACK_FOOTER: "" sims-notify-failure: - needs: [tests] + needs: tests runs-on: ubuntu-latest if: ${{ failure() }} steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 157769d5d75..b07cb69fecd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,7 +232,6 @@ jobs: test-sim-nondeterminism: runs-on: buildjet-4vcpu-ubuntu-2004 - needs: [build] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 diff --git a/Makefile b/Makefile index 6f0a3c81290..249e00d3bc7 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,11 @@ build-docs: ############################################################################### test: test-unit -test-all: test-unit test-ledger-mock test-race test-cover +test-e2e: + make -C tests test-e2e +test-integration: + make -C tests test-integration +test-all: test-unit test-e2e test-integration test-ledger-mock test-race test-cover TEST_PACKAGES=./... TEST_TARGETS := test-unit test-unit-amino test-unit-proto test-ledger-mock test-race test-ledger test-race diff --git a/tests/Makefile b/tests/Makefile index b29fbef1439..2aff22faa9a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,3 @@ -test: test-integration test-e2e - test-integration: go test ./integration/... -timeout 30m