Skip to content

Commit

Permalink
Merge branch 'master' into n8n-3924-node-error-handler-not-behaving-c…
Browse files Browse the repository at this point in the history
…orrectly
  • Loading branch information
agobrech authored Nov 4, 2022
2 parents dddf43e + eb3fffd commit 14bf078
Show file tree
Hide file tree
Showing 814 changed files with 57,842 additions and 41,742 deletions.
19 changes: 19 additions & 0 deletions .github/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3.9'

services:
mysql:
image: mysql:5.7-debian
environment:
- MYSQL_DATABASE=n8n
- MYSQL_ROOT_PASSWORD=password
ports:
- 3306:3306

postgres:
image: postgres:11
environment:
- POSTGRES_DB=n8n
- POSTGRES_USER=root
- POSTGRES_PASSWORD=password
ports:
- 5432:5432
26 changes: 8 additions & 18 deletions .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test Pull Request Semantics
name: Check PR title

on:
pull_request:
Expand All @@ -10,23 +10,13 @@ on:
jobs:
check-pr-title:
runs-on: ubuntu-latest
permissions:
checks: write
pull-requests: read
contents: read
timeout-minutes: 5
steps:
- uses: amannn/action-semantic-pull-request@v4
- name: Check out branch
uses: actions/checkout@v3

- name: Validate PR title
id: validate_pr_title
uses: ivov/validate-n8n-pull-request-title@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# https://www.notion.so/n8n/Release-Process-fce65faea3d5403a85210f7e7a60d0f8
types: |
feat
fix
perf
test
docs
refactor
build
ci
requireScope: false
47 changes: 47 additions & 0 deletions .github/workflows/ci-postgres-mysql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Test Postgres and MySQL schemas

on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest

timeout-minutes: 30

env:
DB_MYSQLDB_PASSWORD: password
DB_POSTGRESDB_PASSWORD: password

steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'npm'

- name: Install npm and dependencies
run: npm install -g npm@latest && npm install

- name: Start MySQL & Postgres
uses: isbang/compose-action@v1.3.2
with:
compose-file: ./.github/docker-compose.yml

- name: Build Core & Workflow
run: npm run -w packages/workflow -w packages/core build

- name: Test MySQL
working-directory: packages/cli
run: npm run test:mysql

- name: Test Postgres
working-directory: packages/cli
run: npm run test:postgres

- name: Test Postgres (alternate schema)
working-directory: packages/cli
run: npm run test:postgres:alt-schema
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dist/test
dist/**/*.{js.map,d.ts}
dist/**/*.{js.map}

.DS_Store

Expand Down
226 changes: 226 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

Portions of this software are licensed as follows:

- All source code files of this repository that contain ".ee." in their filename are licensed under the n8n Enterprise License defined in "LICENSE_EE.md".
- Content of branches other than the main branch (i.e. "master") are not licensed.
- All source code files that contain ".ee." in their filename are licensed under the
"n8n Enterprise License" defined in "LICENSE_EE.md".
- All third party components incorporated into the n8n Software are licensed under the original license
provided by the owner of the applicable component.
- Content outside of the above mentioned files or restrictions above is available under the "Sustainable Use
- Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
License" as defined below.

## Sustainable Use License
Expand Down
Binary file modified assets/n8n-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docker/images/n8n-custom/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG NODE_VERSION=16
# 1. Create an image to build n8n
FROM n8nio/base:${NODE_VERSION} as builder

RUN npm install -g run-script-os turbo
RUN npm install -g run-script-os turbo@1.5.5

COPY turbo.json package.json package-lock.json tsconfig.json ./
COPY packages ./packages
Expand Down
4 changes: 1 addition & 3 deletions docker/images/n8n/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ if [ -d /root/.n8n ] ; then
ln -s /root/.n8n /home/node/
fi

# node user needs to be able to write in this folder to be able to customize static assets
mkdir -p /usr/local/lib/node_modules/n8n/dist/public
chown -R node /home/node /usr/local/lib/node_modules/n8n/dist/public
chown -R node /home/node

if [ "$#" -gt 0 ]; then
# Got started with arguments
Expand Down
21 changes: 21 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const { compilerOptions } = require('./tsconfig.json');

/** @type {import('jest').Config} */
module.exports = {
verbose: true,
preset: 'ts-jest',
testEnvironment: 'node',
testRegex: '\\.(test|spec)\\.(js|ts)$',
testPathIgnorePatterns: ['/dist/', '/node_modules/'],
globals: {
'ts-jest': {
isolatedModules: true,
tsconfig: {
...compilerOptions,
declaration: false,
sourceMap: false,
skipLibCheck: true,
},
},
},
};
Loading

0 comments on commit 14bf078

Please sign in to comment.