Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into n8n-4763-make-emit-…
Browse files Browse the repository at this point in the history
…consistent-in-poll-functions
  • Loading branch information
valya committed Nov 2, 2022
2 parents 8a38ed7 + 41e6489 commit fbdf83a
Show file tree
Hide file tree
Showing 1,368 changed files with 85,515 additions and 82,131 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
3 changes: 2 additions & 1 deletion .github/workflows/test-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: 'n8n/package-lock.json'

- name: Install dependencies
run: |
Expand All @@ -41,8 +42,8 @@ jobs:
shell: bash

- name: npm install and build
working-directory: n8n
run: |
cd n8n
npm install -g npm@latest
npm install
npm run build --if-present
Expand Down
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
289 changes: 289 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,17 @@ tests of all packages.

> **IMPORTANT**: Avoid use of external libraries to ensure your custom nodes can be reviewed and merged quickly.
Learn about [using the node dev CLI](https://docs.n8n.io/nodes/creating-nodes/node-dev-cli.html) to create custom nodes for n8n.
Learn about [using the node dev CLI](https://docs.n8n.io/integrations/creating-nodes/archive/node-developer-cli/) to create custom nodes for n8n.

More information can be found in the documentation of [n8n-node-dev](https://github.com/n8n-io/n8n/tree/master/packages/node-dev), a small CLI which helps with n8n-node-development.

## Create a new node to contribute to n8n

Follow this tutorial on [creating your first node](https://docs.n8n.io/nodes/creating-nodes/create-node.html) for n8n.
Follow this tutorial on [creating your first node](https://docs.n8n.io/integrations/creating-nodes/build/) for n8n.

## Checklist before submitting a new node

There are several things to keep in mind when creating a node. To help you, we prepared a [checklist](https://docs.n8n.io/nodes/creating-nodes/node-review-checklist.html) that covers the requirements for creating nodes, from preparation to submission. This will help us be quicker to review and merge your PR.
There are several things to keep in mind when creating a node. To help you, we prepared a [checklist](https://docs.n8n.io/integrations/creating-nodes/build/reference/) that covers the requirements for creating nodes, from preparation to submission. This will help us be quicker to review and merge your PR.

## Extend documentation

Expand Down
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-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /home/node
COPY .npmrc /usr/local/etc/npmrc

RUN \
apk add --update graphicsmagick tini tzdata ca-certificates && \
apk add --update git graphicsmagick tini tzdata ca-certificates && \
npm install -g npm@latest full-icu && \
rm -rf /var/cache/apk/* /root/.npm /tmp/* && \
# Install fonts
Expand Down
5 changes: 2 additions & 3 deletions docker/images/n8n-custom/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ ARG NODE_VERSION=16
# 1. Create an image to build n8n
FROM n8nio/base:${NODE_VERSION} as builder

RUN \
apk --no-cache add git && \
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
COPY patches ./patches

RUN chown -R node:node .
RUN npm config set legacy-peer-deps true
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 fbdf83a

Please sign in to comment.