Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pay-2610-release-as…
Browse files Browse the repository at this point in the history
…-default
  • Loading branch information
netroy committed Feb 19, 2025
2 parents e2891fb + 5439181 commit 36b1fa8
Show file tree
Hide file tree
Showing 110 changed files with 1,973 additions and 12,677 deletions.
22 changes: 21 additions & 1 deletion .github/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
mariadb:
image: mariadb:10.9
image: mariadb:10.5
environment:
- MARIADB_DATABASE=n8n
- MARIADB_ROOT_PASSWORD=password
Expand All @@ -10,6 +10,26 @@ services:
tmpfs:
- /var/lib/mysql

mysql-8.0.13:
image: mysql:8.0.13
environment:
- MYSQL_DATABASE=n8n
- MYSQL_ROOT_PASSWORD=password
ports:
- 3306:3306
tmpfs:
- /var/lib/mysql

mysql-8.4:
image: mysql:8.4
environment:
- MYSQL_DATABASE=n8n
- MYSQL_ROOT_PASSWORD=password
ports:
- 3306:3306
tmpfs:
- /var/lib/mysql

postgres:
image: postgres:16
restart: always
Expand Down
48 changes: 46 additions & 2 deletions .github/workflows/ci-postgres-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,50 @@ jobs:
working-directory: packages/cli
run: pnpm test:mariadb --testTimeout 30000

mysql:
name: MySQL (${{ matrix.service-name }})
runs-on: ubuntu-latest
needs: build
timeout-minutes: 20
strategy:
matrix:
service-name: [ 'mysql-8.0.13', 'mysql-8.4' ]
env:
DB_MYSQLDB_PASSWORD: password
steps:
- uses: actions/checkout@v4.1.1

- uses: actions/setup-node@v4.2.0
with:
node-version: 20.x

- name: Setup corepack and pnpm
run: |
npm i -g corepack@0.31
corepack enable
- run: pnpm install --frozen-lockfile

- name: Setup build cache
uses: rharkor/caching-for-turbo@v1.5

- name: Restore cached build artifacts
uses: actions/cache/restore@v4.2.0
with:
path: ./packages/**/dist
key: ${{ github.sha }}:db-tests

- name: Start MySQL
uses: isbang/compose-action@v2.0.0
with:
compose-file: ./.github/docker-compose.yml
services: |
${{ matrix.service-name }}
- name: Test MySQL
working-directory: packages/cli
run: pnpm test:mysql --testTimeout 30000

postgres:
name: Postgres
runs-on: ubuntu-latest
Expand Down Expand Up @@ -168,7 +212,7 @@ jobs:
notify-on-failure:
name: Notify Slack on failure
runs-on: ubuntu-latest
needs: [mariadb, postgres]
needs: [mariadb, postgres, mysql]
steps:
- name: Notify Slack on failure
uses: act10ns/slack@v2.0.0
Expand All @@ -177,4 +221,4 @@ jobs:
status: ${{ job.status }}
channel: '#alerts-build'
webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
message: Postgres or MariaDB tests failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
message: Postgres, MariaDB or MySQL tests failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pnpm-lock.yaml
packages/editor-ui/index.html
packages/nodes-base/nodes/**/test
packages/cli/templates/form-trigger.handlebars
packages/cli/templates/form-trigger-completion.handlebars
cypress/fixtures
CHANGELOG.md
.github/pull_request_template.md
Expand Down
Loading

0 comments on commit 36b1fa8

Please sign in to comment.