From 96c209de7bb553d30f6f7ce37ff672c64f391ffd Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 30 Oct 2020 22:28:28 +0300 Subject: [PATCH 1/4] test Signed-off-by: Vasiliy Tolstov --- .github/workflows/pr.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fd848502..743f4023 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,12 +20,25 @@ jobs: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go- - - name: deps + - name: sdk deps run: go get -v -t -d ./... - - name: test + - name: sdk test env: INTEGRATION_TESTS: yes run: go test -mod readonly -v ./... + - name: checkout tests + uses: actions/checkout@v2 + with: + repository: unistack-org/micro-tests + ref: refs/heads/master + path: micro-tests + fetch-depth: 1 + - name: micro deps + run: cd micro-tests && go get -v -t -d ./... + - name: micro test + env: + INTEGRATION_TESTS: yes + run: cd micro-tests && go test -mod readonly -v ./... lint: name: lint runs-on: ubuntu-latest -- 2.45.2 From fe8b5549b9d3b89faea8e09ad66bf4959fab559e Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 30 Oct 2020 23:32:13 +0300 Subject: [PATCH 2/4] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/pr.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 743f4023..e29297ab 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,10 @@ jobs: path: micro-tests fetch-depth: 1 - name: micro deps - run: cd micro-tests && go get -v -t -d ./... + run: | + cd micro-tests + go mod edit -replace="github.com/unistack-org/micro/v3=../" + go get -v -t -d ./... - name: micro test env: INTEGRATION_TESTS: yes -- 2.45.2 From 33e3d01b1f4cd8cb5ec8c45acff78f72b1a23b4f Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 30 Oct 2020 23:40:04 +0300 Subject: [PATCH 3/4] fix Signed-off-by: Vasiliy Tolstov --- .github/workflows/pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e29297ab..c0672750 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,33 +12,33 @@ jobs: uses: actions/setup-go@v1 with: go-version: 1.15 - - name: checkout - uses: actions/checkout@v2 - name: cache uses: actions/cache@v2 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go- + - name: sdk checkout + uses: actions/checkout@v2 - name: sdk deps run: go get -v -t -d ./... - name: sdk test env: INTEGRATION_TESTS: yes run: go test -mod readonly -v ./... - - name: checkout tests + - name: tests checkout uses: actions/checkout@v2 with: repository: unistack-org/micro-tests ref: refs/heads/master path: micro-tests fetch-depth: 1 - - name: micro deps + - name: tests deps run: | cd micro-tests go mod edit -replace="github.com/unistack-org/micro/v3=../" go get -v -t -d ./... - - name: micro test + - name: tests test env: INTEGRATION_TESTS: yes run: cd micro-tests && go test -mod readonly -v ./... -- 2.45.2 From 412b3e984e8bf15d819878ffc2fc71385830c51d Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 30 Oct 2020 23:48:22 +0300 Subject: [PATCH 4/4] fix Signed-off-by: Vasiliy Tolstov --- .github/workflows/build.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cce94f06..24ca256d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: build on: - push: + push: branches: - master jobs: @@ -12,20 +12,36 @@ jobs: uses: actions/setup-go@v1 with: go-version: 1.15 - - name: checkout - uses: actions/checkout@v2 - name: cache uses: actions/cache@v2 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go- - - name: deps + - name: sdk checkout + uses: actions/checkout@v2 + - name: sdk deps run: go get -v -t -d ./... - - name: test + - name: sdk test env: INTEGRATION_TESTS: yes run: go test -mod readonly -v ./... + - name: tests checkout + uses: actions/checkout@v2 + with: + repository: unistack-org/micro-tests + ref: refs/heads/master + path: micro-tests + fetch-depth: 1 + - name: tests deps + run: | + cd micro-tests + go mod edit -replace="github.com/unistack-org/micro/v3=../" + go get -v -t -d ./... + - name: tests test + env: + INTEGRATION_TESTS: yes + run: cd micro-tests && go test -mod readonly -v ./... lint: name: lint runs-on: ubuntu-latest -- 2.45.2