Merge tag 'n8n@1.116.1' into flare-main

Author: leameow

.actrc

@@ -0,0 +1,5 @@
+-P blacksmith-2vcpu-ubuntu-2204=ubuntu-latest
+-P blacksmith-4vcpu-ubuntu-2204=ubuntu-latest
+-P ubuntu-22.04=ubuntu-latest
+-P ubuntu-20.04=ubuntu-latest
+--container-architecture linux/amd64

.dockerignore

@@ -1,4 +1,7 @@
+# We want to include the THIRD_PARTY_LICENSES.md file in the Docker image,
+# but not other .md files
 **/*.md
+!**/THIRD_PARTY_LICENSES.md
 **/.env
 .cache
 assets

.github/ISSUE_TEMPLATE/01-bug.yml

@@ -85,7 +85,7 @@ body:
     id: execution-mode
     attributes:
       label: Execution mode
-      description: '[Info](https://docs.n8n.io/hosting/scaling/execution-modes-processes/)'
+      description: '[Info](https://docs.n8n.io/hosting/scaling/queue-mode/)'
       options:
         - main (default)
         - queue

.github/actionlint.yaml

@@ -0,0 +1,7 @@
+self-hosted-runner:
+  labels:
+    - blacksmith-2vcpu-ubuntu-2204
+    - blacksmith-4vcpu-ubuntu-2204
+    - blacksmith-2vcpu-ubuntu-2204-arm
+    - blacksmith-4vcpu-ubuntu-2204-arm
+    - blacksmith-8vcpu-ubuntu-2204

.github/actions/setup-and-build/action.yml

@@ -26,16 +26,16 @@ runs:
         node-version: ${{ inputs.node-version }}
 
     - name: Setup pnpm and Install Dependencies
-      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.0.0
+      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
       with:
         run_install: true
 
     - name: Configure Turborepo Cache
       uses: useblacksmith/caching-for-turbo@bafb57e7ebdbf1185762286ec94d24648cd3938a # v1
 
-    - name: Setup Blacksmith Buildx for Docker Cache
+    - name: Setup Docker Builder for Docker Cache
       if: ${{ inputs.enable-docker-cache == 'true' }}
-      uses: useblacksmith/build-push-action@574eb0ee0b59c6a687ace24192f0727dfb65d6d7 # v1.2.0
+      uses: useblacksmith/setup-docker-builder@0b434dfbb431f4e3a2bcee7a773a56bd363184c5 # v1
 
     - name: Build Project
       run: ${{ inputs.build-command }}

.github/actions/setup-nodejs-blacksmith/action.yml

@@ -0,0 +1,33 @@
+name: 'GitHub Node.js Build Setup for Github Hosted Runners'
+description: 'Configures Node.js with pnpm, installs dependencies, enables Turborepo caching, and builds the project or an optional command.'
+
+inputs:
+  node-version:
+    description: 'Node.js version to use. Uses latest 22.x by default.'
+    required: false
+    default: '22.x'
+  build-command:
+    description: 'Command to execute for building the project or an optional command. Leave empty to skip build step.'
+    required: false
+    default: 'pnpm build'
+    type: string
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup Node.js
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      with:
+        node-version: ${{ inputs.node-version }}
+
+    - name: Setup pnpm and Install Dependencies
+      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      with:
+        run_install: true
+
+    - name: Configure Turborepo Cache
+      uses: rharkor/caching-for-turbo@2b4b5b14a8d16b8556a58993a8ac331d56d8906d # v2.3.2
+
+    - name: Build Project
+      run: ${{ inputs.build-command }}
+      shell: bash

.github/actions/setup-nodejs-github/action.yml

@@ -10,16 +10,6 @@ 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:

.github/docker-compose.yml

@@ -7,9 +7,24 @@ import assert from 'assert';
 
 const exec = promisify(child_process.exec);
 
+function generateExperimentalVersion(currentVersion) {
+	const parsed = semver.parse(currentVersion);
+	if (!parsed) throw new Error(`Invalid version: ${currentVersion}`);
+
+	// Check if it's already an experimental version
+	if (parsed.prerelease.length > 0 && parsed.prerelease[0] === 'exp') {
+		// Increment the experimental minor version
+		const expMinor = (parsed.prerelease[1] || 0) + 1;
+		return `${parsed.major}.${parsed.minor}.${parsed.patch}-exp.${expMinor}`;
+	}
+
+	// Create new experimental version: <major>.<minor>.<patch>-exp.0
+	return `${parsed.major}.${parsed.minor}.${parsed.patch}-exp.0`;
+}
+
 const rootDir = process.cwd();
 const releaseType = process.env.RELEASE_TYPE;
-assert.match(releaseType, /^(patch|minor|major)$/, 'Invalid RELEASE_TYPE');
+assert.match(releaseType, /^(patch|minor|major|experimental)$/, 'Invalid RELEASE_TYPE');
 
 // TODO: if releaseType is `auto` determine release type based on the changelog
 
@@ -46,7 +61,9 @@ for (const packageName in packageMap) {
 		Object.keys(packageJson.dependencies || {}).some(
 			(dependencyName) => packageMap[dependencyName]?.isDirty,
 		)
-			? semver.inc(version, releaseType)
+			? releaseType === 'experimental'
+				? generateExperimentalVersion(version)
+				: semver.inc(version, releaseType)
 			: version;
 
 	await writeFile(packageFile, JSON.stringify(packageJson, null, 2) + '\n');

.github/scripts/bump-versions.mjs

@@ -9,6 +9,7 @@ import packageJson from '../../package.json' with { type: 'json' };
 
 const baseDir = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
 const fullChangelogFile = resolve(baseDir, 'CHANGELOG.md');
+// Version includes experimental versions (e.g., 1.2.3-exp.0)
 const versionChangelogFile = resolve(baseDir, `CHANGELOG-${packageJson.version}.md`);
 
 const changelogStream = conventionalChangelog({