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.

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

Support node v14 + CI refactor #8226

Merged
merged 6 commits into from
Oct 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/actions/install-modules/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: 'Install modules'
description: 'Run yarn install and add global modules'
inputs:
globalPackages:
description: 'Global packages to install'
runs:
using: 'composite'
steps:
- run: $GITHUB_ACTION_PATH/script.sh
env:
GLOBAL_PACKAGES: ${{ inputs.globalPackages }}
shell: bash
8 changes: 8 additions & 0 deletions .github/actions/install-modules/script.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# install global packages if set
if [[ -n "$GLOBAL_PACKAGES" ]]; then
yarn global add "$GLOBAL_PACKAGES"
yarn global bin >>$GITHUB_PATH
fi

# run yarn
yarn
16 changes: 16 additions & 0 deletions .github/actions/run-e2e-tests/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: 'Run E2E tests'
description: 'Run end to end tests'
inputs:
dbOptions:
description: 'Database options'
required: true
runEE:
description: 'Should run EE or CE tests'
runs:
using: 'composite'
steps:
- run: $GITHUB_ACTION_PATH/script.sh
env:
DB_OPTIONS: ${{ inputs.dbOptions }}
RUN_EE: ${{ inputs.runEE }}
shell: bash
11 changes: 11 additions & 0 deletions .github/actions/run-e2e-tests/script.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## disable EE if options not set
if [[ -z "$RUN_EE" ]]; then
export STRAPI_DISABLE_EE=true
fi

opts=($DB_OPTIONS)

yarn run -s test:generate-app "${opts[@]}" $@
yarn run -s test:start-app &
wait-on http://localhost:1337
yarn run -s test:e2e
321 changes: 321 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,321 @@
name: 'Tests'

on:
pull_request:
paths-ignore:
- 'docs/**'

alexandrebodin marked this conversation as resolved.
Show resolved Hide resolved
jobs:
lint:
name: 'lint (node: ${{ matrix.node }})'
runs-on: ubuntu-latest
strategy:
matrix:
node: [12, 14]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
- name: Run lint
run: yarn run -s lint

unit_back:
name: 'unit_back (node: ${{ matrix.node }})'
needs: [lint]
runs-on: ubuntu-latest
env:
CODECOV_TOKEN: ${{ secrets.codecov }}
strategy:
matrix:
node: [12, 14]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: codecov
- name: Run tests
run: yarn run -s test:unit --coverage && codecov -C -F unit

unit_front:
name: 'unit_front (node: ${{ matrix.node }})'
needs: [lint]
runs-on: ubuntu-latest
env:
CODECOV_TOKEN: ${{ secrets.codecov }}
strategy:
matrix:
node: [12, 14]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: codecov
- name: Build
run: yarn build
- name: Run test
alexandrebodin marked this conversation as resolved.
Show resolved Hide resolved
run: yarn run -s test:front && codecov -C -F front

e2e_ce_pg:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[CE] E2E (postgres, node: ${{ matrix.node }})'
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
postgres:
# Docker Hub image
image: postgres
# Provide the password for postgres
env:
POSTGRES_USER: strapi
POSTGRES_PASSWORD: strapi
POSTGRES_DB: strapi_test
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'

e2e_ce_mysql:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[CE] E2E (mysql, node: ${{ matrix.node }})'
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
mysql:
image: mysql
options: >-
--health-cmd="mysqladmin ping"
--health-interval=10s
--health-timeout=5s
--health-retries=3
-e MYSQL_ROOT_PASSWORD=strapi
-e MYSQL_ROOT_HOST="%"
-e MYSQL_USER=strapi
-e MYSQL_PASSWORD=strapi
-e MYSQL_DATABASE=strapi_test
--entrypoint sh mysql -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
ports:
# Maps tcp port 5432 on service container to the host
- 3306:3306
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'

e2e_ce_sqlite:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[CE] E2E (sqlite, node: ${{ matrix.node }})'
strategy:
matrix:
node: [12, 14]
max-parallel: 2
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=sqlite --dbfile=./tmp/data.db'

e2e_ce_mongo:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[CE] E2E (mongo, node: ${{ matrix.node }})'
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
mongo:
image: mongo
ports:
- 27017:27017
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=mongo --dbhost=localhost --dbport=27017 --dbname=strapi_test'

# EE
e2e_ee_pg:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[EE] E2E (postgres, node: ${{ matrix.node }})'
if: github.event.pull_request.head.repo.full_name == github.repository
env:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
postgres:
# Docker Hub image
image: postgres
# Provide the password for postgres
env:
POSTGRES_USER: strapi
POSTGRES_PASSWORD: strapi
POSTGRES_DB: strapi_test
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
runEE: true

e2e_ee_mysql:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[EE] E2E (mysql, node: ${{ matrix.node }})'
if: github.event.pull_request.head.repo.full_name == github.repository
env:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
mysql:
image: mysql
options: >-
--health-cmd="mysqladmin ping"
--health-interval=10s
--health-timeout=5s
--health-retries=3
-e MYSQL_ROOT_PASSWORD=strapi
-e MYSQL_ROOT_HOST="%"
-e MYSQL_USER=strapi
-e MYSQL_PASSWORD=strapi
-e MYSQL_DATABASE=strapi_test
--entrypoint sh mysql -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
ports:
# Maps tcp port 5432 on service container to the host
- 3306:3306
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
runEE: true

e2e_ee_sqlite:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[EE] E2E (sqlite, node: ${{ matrix.node }})'
if: github.event.pull_request.head.repo.full_name == github.repository
env:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [12, 14]
max-parallel: 2
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=sqlite --dbfile=./tmp/data.db'
runEE: true

e2e_ee_mongo:
runs-on: ubuntu-latest
needs: [lint, unit_back, unit_front]
name: '[EE] E2E (mongo, node: ${{ matrix.node }})'
if: github.event.pull_request.head.repo.full_name == github.repository
env:
STRAPI_LICENSE: ${{ secrets.strapiLicense }}
strategy:
matrix:
node: [12, 14]
max-parallel: 2
services:
mongo:
image: mongo
ports:
- 27017:27017
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- uses: ./.github/actions/install-modules
with:
globalPackages: wait-on
- uses: ./.github/actions/run-e2e-tests
with:
dbOptions: '--dbclient=mongo --dbhost=localhost --dbport=27017 --dbname=strapi_test'
runEE: true