From 05c01c33ac57b084f11116e4e7da303285a09a6d Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Tue, 1 Nov 2022 23:31:02 +0800 Subject: [PATCH 01/14] run e2e test for macOS --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bb73388f3..755d8545a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -92,7 +92,7 @@ jobs: ENVD_ANALYTICS: false strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code @@ -128,7 +128,7 @@ jobs: ENVD_ANALYTICS: false strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code From f7510286410164aa328ef85af238496807e282ca Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 14:39:52 +0800 Subject: [PATCH 02/14] change action --- .github/workflows/CI.yml | 4 ++-- .github/workflows/nightly.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 755d8545a..56d7785b6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -110,7 +110,7 @@ jobs: ${{ runner.OS }}-build-${{ env.cache-name }}- ${{ runner.OS }}-build- ${{ runner.OS }}- - - uses: actions-ecosystem/action-get-latest-tag@v1 + - uses: "WyriHaximus/github-action-get-previous-tag@v1" id: get-latest-tag - name: e2e test run: make e2e-cli-test @@ -146,7 +146,7 @@ jobs: ${{ runner.OS }}-build-${{ env.cache-name }}- ${{ runner.OS }}-build- ${{ runner.OS }}- - - uses: actions-ecosystem/action-get-latest-tag@v1 + - uses: "WyriHaximus/github-action-get-previous-tag@v1" id: get-latest-tag - name: e2e test run: make e2e-lang-test diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 703182871..bcd7bba3d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -82,7 +82,7 @@ jobs: ENVD_ANALYTICS: false strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code @@ -100,7 +100,7 @@ jobs: ${{ runner.OS }}-build-${{ env.cache-name }}- ${{ runner.OS }}-build- ${{ runner.OS }}- - - uses: actions-ecosystem/action-get-latest-tag@v1 + - uses: "WyriHaximus/github-action-get-previous-tag@v1" id: get-latest-tag - name: e2e test run: make e2e-cli-test @@ -118,7 +118,7 @@ jobs: ENVD_ANALYTICS: false strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code @@ -136,7 +136,7 @@ jobs: ${{ runner.OS }}-build-${{ env.cache-name }}- ${{ runner.OS }}-build- ${{ runner.OS }}- - - uses: actions-ecosystem/action-get-latest-tag@v1 + - uses: "WyriHaximus/github-action-get-previous-tag@v1" id: get-latest-tag - name: e2e test run: make e2e-lang-test From 706f1053b3a1bedabfd75a174ba8b67439813a5d Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 14:47:51 +0800 Subject: [PATCH 03/14] fix --- .github/workflows/CI.yml | 4 ++++ .github/workflows/nightly.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 56d7785b6..df2fd820b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -97,6 +97,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Go uses: actions/setup-go@v3 with: @@ -133,6 +135,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index bcd7bba3d..ad89851fd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -87,6 +87,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Go uses: actions/setup-go@v3 with: @@ -123,6 +125,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Go uses: actions/setup-go@v3 with: From 0460ee54a09fb1b11946775fa8a2243951cb29ac Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 15:21:50 +0800 Subject: [PATCH 04/14] set up docker --- .github/workflows/CI.yml | 6 ++++++ .github/workflows/nightly.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index df2fd820b..c2567c858 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -99,6 +99,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up docker + uses: docker-practice/actions-setup-docker@master + if: ${{ matrix.os == 'macos-latest' }} - name: Setup Go uses: actions/setup-go@v3 with: @@ -137,6 +140,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up docker + uses: docker-practice/actions-setup-docker@master + if: ${{ matrix.os == 'macos-latest' }} - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ad89851fd..64a2d486c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -89,6 +89,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up docker + uses: docker-practice/actions-setup-docker@master + if: ${{ matrix.os == 'macos-latest' }} - name: Setup Go uses: actions/setup-go@v3 with: @@ -127,6 +130,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up docker + uses: docker-practice/actions-setup-docker@master + if: ${{ matrix.os == 'macos-latest' }} - name: Setup Go uses: actions/setup-go@v3 with: From 8badcc6a121d3c19c2196a88c9a12148cdddeb78 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 16:54:14 +0800 Subject: [PATCH 05/14] use colima --- .github/workflows/CI.yml | 8 ++++++-- .github/workflows/nightly.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c2567c858..5de6bbe96 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -100,8 +100,10 @@ jobs: with: fetch-depth: 0 - name: Set up docker - uses: docker-practice/actions-setup-docker@master if: ${{ matrix.os == 'macos-latest' }} + run: | + brew install docker + colima start - name: Setup Go uses: actions/setup-go@v3 with: @@ -141,8 +143,10 @@ jobs: with: fetch-depth: 0 - name: Set up docker - uses: docker-practice/actions-setup-docker@master if: ${{ matrix.os == 'macos-latest' }} + run: | + brew install docker + colima start - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 64a2d486c..0f5d6216f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -90,8 +90,10 @@ jobs: with: fetch-depth: 0 - name: Set up docker - uses: docker-practice/actions-setup-docker@master if: ${{ matrix.os == 'macos-latest' }} + run: | + brew install docker + colima start - name: Setup Go uses: actions/setup-go@v3 with: @@ -131,8 +133,10 @@ jobs: with: fetch-depth: 0 - name: Set up docker - uses: docker-practice/actions-setup-docker@master if: ${{ matrix.os == 'macos-latest' }} + run: | + brew install docker + colima start - name: Setup Go uses: actions/setup-go@v3 with: From 775f218bd040d1157a8459a4017b02cf42c3ee26 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 17:19:48 +0800 Subject: [PATCH 06/14] fix colima --- .github/workflows/CI.yml | 2 ++ .github/workflows/nightly.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5de6bbe96..0fc2eda7b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,6 +104,7 @@ jobs: run: | brew install docker colima start + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -147,6 +148,7 @@ jobs: run: | brew install docker colima start + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0f5d6216f..ad9c451cf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -94,6 +94,7 @@ jobs: run: | brew install docker colima start + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -137,6 +138,7 @@ jobs: run: | brew install docker colima start + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: From 485c86bb6bf7e433e9be08275d1c943f9e9a46f2 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 17:33:05 +0800 Subject: [PATCH 07/14] fix --- .github/workflows/CI.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0fc2eda7b..cf366306d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,7 +104,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -148,7 +148,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ad9c451cf..1a4048c37 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -94,7 +94,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -138,7 +138,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: From 7a93554d938bc7140fd33b159192c61231ec8b8c Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 17:51:23 +0800 Subject: [PATCH 08/14] Revert "fix" This reverts commit 485c86bb6bf7e433e9be08275d1c943f9e9a46f2. --- .github/workflows/CI.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cf366306d..0fc2eda7b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,7 +104,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -148,7 +148,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1a4048c37..ad9c451cf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -94,7 +94,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -138,7 +138,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://${{env.HOME}}/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: From 58b958b4582f94f03584548c9c85ecad33afa1c4 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 17:55:04 +0800 Subject: [PATCH 09/14] fix socket path --- .github/workflows/CI.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0fc2eda7b..c6b846463 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,7 +104,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -148,7 +148,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ad9c451cf..ff9bfc68f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -94,7 +94,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -138,7 +138,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/docker.sock" >> $GITHUB_ENV + echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: From 8ad40919e1b3d86a109e5a01a22e938d61a98809 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 18:10:37 +0800 Subject: [PATCH 10/14] fix --- .github/workflows/CI.yml | 20 ++++++++++---------- .github/workflows/nightly.yml | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c6b846463..60016bf57 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,16 +5,16 @@ on: branches: - main paths: - - '.github/workflows/**' - - '**.go' - - 'Makefile' - - 'go.**' + - ".github/workflows/**" + - "**.go" + - "Makefile" + - "go.**" pull_request: paths: - - '.github/workflows/**' - - '**.go' - - 'Makefile' - - 'go.**' + - ".github/workflows/**" + - "**.go" + - "Makefile" + - "go.**" concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -104,7 +104,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV + echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -148,7 +148,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV + echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ff9bfc68f..a5912bd14 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2,7 +2,7 @@ name: nightly on: schedule: - - cron: '0 2 * * *' # UTC 2:00 every day + - cron: "0 2 * * *" # UTC 2:00 every day # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -46,7 +46,7 @@ jobs: ENVD_ANALYTICS: false strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code @@ -94,7 +94,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV + echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -138,7 +138,7 @@ jobs: run: | brew install docker colima start - echo "DOCKER_HOST="unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV + echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -206,7 +206,7 @@ jobs: name: build strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - name: Check out code From c221ea5d1815c3148efd8f42e3b3af55a8bbbb5e Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Wed, 2 Nov 2022 18:29:34 +0800 Subject: [PATCH 11/14] fix --- .github/workflows/CI.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 60016bf57..e6db6fea9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -104,7 +104,7 @@ jobs: run: | brew install docker colima start - echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -148,7 +148,7 @@ jobs: run: | brew install docker colima start - echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a5912bd14..8b973968e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -94,7 +94,7 @@ jobs: run: | brew install docker colima start - echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: @@ -138,7 +138,7 @@ jobs: run: | brew install docker colima start - echo 'DOCKER_HOST="unix://$HOME/.colima/default/docker.sock"' >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 with: From 13d231a7b330b370a62d0d92b5e6d6cdaed5ec45 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Thu, 24 Nov 2022 18:57:51 +0800 Subject: [PATCH 12/14] extend timeout --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2592b0c5a..b69bfcd87 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ e2e-cli-test: -X $(ROOT)/pkg/version.gitTreeState=$(GIT_TREE_STATE) \ -X $(ROOT)/pkg/version.gitTag="$(shell git describe --tags --abbrev=0)" \ -X $(ROOT)/pkg/version.developmentFlag=true" \ - -race -v -timeout 20m -coverpkg=./pkg/app -coverprofile=e2e-cli-coverage.out ./e2e/cli + -race -v -timeout 30m -coverpkg=./pkg/app -coverprofile=e2e-cli-coverage.out ./e2e/cli e2e-lang-test: @go test -ldflags "-s -w -X $(ROOT)/pkg/version.version=$(VERSION) \ @@ -202,7 +202,7 @@ e2e-lang-test: -X $(ROOT)/pkg/version.gitTreeState=$(GIT_TREE_STATE) \ -X $(ROOT)/pkg/version.gitTag="$(shell git describe --tags --abbrev=0)" \ -X $(ROOT)/pkg/version.developmentFlag=true" \ - -race -v -timeout 20m -coverpkg=./pkg/app -coverprofile=e2e-lang-coverage.out ./e2e/language + -race -v -timeout 30m -coverpkg=./pkg/app -coverprofile=e2e-lang-coverage.out ./e2e/language e2e-doc-test: @go test -ldflags "-s -w -X $(ROOT)/pkg/version.version=$(VERSION) \ From 9c53b4070c990db4413ce1658b363ed52cf6585b Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Fri, 25 Nov 2022 00:10:40 +0800 Subject: [PATCH 13/14] fix VM setting --- .github/workflows/CI.yml | 6 +++--- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9f103c228..5c8cc0f7e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -103,7 +103,7 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} run: | brew install docker - colima start + colima start --cpu 3 --memory 14 echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 @@ -147,7 +147,7 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} run: | brew install docker - colima start + colima start --cpu 3 --memory 14 echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 @@ -223,7 +223,7 @@ jobs: with: name: coverage-out path: merge - + - name: Get cli e2e coverage report uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8b973968e..d0800e6df 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -93,7 +93,7 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} run: | brew install docker - colima start + colima start --cpu 3 --memory 14 echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 @@ -137,7 +137,7 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} run: | brew install docker - colima start + colima start --cpu 3 --memory 14 echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v3 From fe8fe470e36758f65b45710756f1651a2525df69 Mon Sep 17 00:00:00 2001 From: nasnoisaac Date: Fri, 25 Nov 2022 01:47:41 +0800 Subject: [PATCH 14/14] rerun action