Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: run e2e test for macOS #1138

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

ci: run e2e test for macOS #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
05c01c3
run e2e test for macOS
nasnoisaac Nov 1, 2022
f751028
change action
nasnoisaac Nov 2, 2022
706f105
fix
nasnoisaac Nov 2, 2022
0460ee5
set up docker
nasnoisaac Nov 2, 2022
8badcc6
use colima
nasnoisaac Nov 2, 2022
775f218
fix colima
nasnoisaac Nov 2, 2022
485c86b
fix
nasnoisaac Nov 2, 2022
7a93554
Revert "fix"
nasnoisaac Nov 2, 2022
58b958b
fix socket path
nasnoisaac Nov 2, 2022
8ad4091
fix
nasnoisaac Nov 2, 2022
c221ea5
fix
nasnoisaac Nov 2, 2022
13d231a
extend timeout
nasnoisaac Nov 24, 2022
a87600b
Merge branch 'main' into issue-1019
nasnoisaac Nov 24, 2022
9c53b40
fix VM setting
nasnoisaac Nov 24, 2022
fe8fe47
rerun action
nasnoisaac Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -92,11 +92,19 @@ jobs:
ENVD_ANALYTICS: false
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up docker
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew install docker
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
with:
Expand All @@ -110,7 +118,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
Expand All @@ -128,11 +136,19 @@ jobs:
ENVD_ANALYTICS: false
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up docker
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew install docker
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
with:
Expand All @@ -146,7 +162,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
Expand Down Expand Up @@ -207,7 +223,7 @@ jobs:
with:
name: coverage-out
path: merge

- name: Get cli e2e coverage report
uses: actions/download-artifact@v3
with:
Expand Down
30 changes: 23 additions & 7 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -82,11 +82,19 @@ jobs:
ENVD_ANALYTICS: false
strategy:
matrix:
os: [ ubuntu-latest ]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up docker
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew install docker
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
with:
Expand All @@ -100,7 +108,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
Expand All @@ -118,11 +126,19 @@ jobs:
ENVD_ANALYTICS: false
strategy:
matrix:
os: [ ubuntu-latest ]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up docker
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew install docker
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
with:
Expand All @@ -136,7 +152,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
Expand Down Expand Up @@ -190,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
Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ 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/... -coverprofile=e2e-cli-coverage.out ./e2e/cli
-race -v -timeout 30m -coverpkg=./pkg/... -coverprofile=e2e-cli-coverage.out ./e2e/cli


e2e-lang-test:
@go test -ldflags "-s -w -X $(ROOT)/pkg/version.version=$(VERSION) \
Expand All @@ -202,7 +203,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/... -coverprofile=e2e-lang-coverage.out ./e2e/language
-race -v -timeout 30m -coverpkg=./pkg/... -coverprofile=e2e-lang-coverage.out ./e2e/language

e2e-doc-test:
@go test -ldflags "-s -w -X $(ROOT)/pkg/version.version=$(VERSION) \
Expand Down