Skip to content

Commit

Permalink
Merge branch 'master' into N8N-5677-refactor-workflows-store
Browse files Browse the repository at this point in the history
* master: (110 commits)
  fix(editor): Update and add design system checkbox component to Editor (#6178)
  fix(editor): Display SSO entry in Settings on Cloud (#6181)
  feat(Code Node): Add Python support (#4295)
  fix(editor): Update and fix storybook (was failing to run in local dev mode) (#6180)
  feat(Kafka Trigger Node): Add non-parallel execution (#6175)
  fix(Postgres Node): Always return TIMESTAMP and TIMESTAMPZ as ISO string (#6145)
  fix: Revert change that hid the SSH private key (no-changelog) (#6158)
  fix(Google Sheets Node): Upgrade xlsx to address CVE-2023-30533 (#6172)
  fix(editor): Show the correct actions count in the nodes list (#6183)
  ci: Revert full db reset for e2e (no-changelog) (#6182)
  fix(AWS Rekognition Node): Fix all different action type (#6136)
  feat(Airtable Node): Access token support (#6160)
  fix(editor): Remove duplicate mapping of `item.json` key in data pinning (#6135)
  fix(HTTP Request Node): Correctly doesn't redirect on non GET method (#6132)
  fix(MySQL Node): Node should return date types as strings (#6169)
  feat(JotForm Trigger Node): Add support for hipaa-api.jotform.com (#6171)
  🚀 Release 0.227.0 (#6167)
  fix(editor): Flag issues only on workflow activation (#6127)
  fix(editor): Faster reconnects for push (no-changelog) (#6164)
  fix: Log unhandled errors during license activation (no-changelog) (#6165)
  ...

# Conflicts:
#	packages/editor-ui/src/mixins/workflowHelpers.ts
#	packages/editor-ui/src/views/NodeView.vue
  • Loading branch information
MiloradFilipovic committed May 5, 2023
2 parents f2c5398 + 13c143e commit f8829a2
Show file tree
Hide file tree
Showing 781 changed files with 26,317 additions and 9,458 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,13 @@ jobs:
name: E2E [Electron/Node 16]
uses: ./.github/workflows/e2e-reusable.yml
with:
branch: ${{ github.event.pull_request.head.ref }}
branch: ${{ github.event.pull_request.base.ref }}
user: ${{ github.event.inputs.user || 'PR User' }}
spec: ${{ github.event.inputs.spec || 'e2e/0-smoke.cy.ts' }}
run-env: base:16.18.1
run-env: browsers:node16.18.0-chrome107-ff106-edge
record: false
parallel: false
pr_number: ${{ github.event.number }}
containers: '[1]'
secrets:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
Expand Down
49 changes: 45 additions & 4 deletions .github/workflows/e2e-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
description: 'GitHub branch to test.'
required: false
type: string
default: 'master'
user:
description: 'User who kicked this off.'
required: false
Expand Down Expand Up @@ -43,10 +42,19 @@ on:
required: false
default: '[1, 2, 3, 4, 5, 6, 7, 8]'
type: string
pr_number:
description: 'PR number to run tests for.'
required: false
type: number
secrets:
CYPRESS_RECORD_KEY:
description: 'Cypress record key.'
required: true
outputs:
tests_passed:
description: 'True if all E2E tests passed, otherwise false'
value: ${{ jobs.check_testing_matrix.outputs.all_tests_passed }}


jobs:
# single job that generates and outputs a common id
Expand Down Expand Up @@ -74,6 +82,12 @@ jobs:
repository: n8n-io/n8n
ref: ${{ inputs.branch }}

- name: Checkout PR
if: ${{ inputs.pr_number }}
run: |
git fetch origin pull/${{ inputs.pr_number }}/head
git checkout FETCH_HEAD
- name: Setup pnpm
uses: pnpm/action-setup@v2.2.4
with:
Expand Down Expand Up @@ -109,13 +123,21 @@ jobs:
strategy:
fail-fast: false
matrix:
containers: ${{ fromJSON(inputs.containers) }}
# If spec is not e2e/* then we run only one container to prevent
# running the same tests multiple times
containers: ${{ fromJSON( inputs.spec == 'e2e/*' && inputs.containers || '[1]' ) }}
steps:
- uses: actions/checkout@v3
with:
repository: n8n-io/n8n
ref: ${{ inputs.branch }}

- name: Checkout PR
if: ${{ inputs.pr_number }}
run: |
git fetch origin pull/${{ inputs.pr_number }}/head
git checkout FETCH_HEAD
- name: Setup pnpm
uses: pnpm/action-setup@v2.2.4

Expand All @@ -135,9 +157,9 @@ jobs:
install: false
start: pnpm start
wait-on: 'http://localhost:5678'
wait-on-timeout: 120 #
wait-on-timeout: 120
record: ${{ inputs.record }}
parallel: ${{ inputs.parallel }}
parallel: ${{ fromJSON( inputs.spec == 'e2e/*' && inputs.parallel || false ) }}
# We have to provide custom ci-build-id key to make sure that this workflow could be run multiple times
# in the same parent workflow
ci-build-id: ${{ needs.prepare.outputs.uuid }}
Expand All @@ -148,3 +170,22 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
E2E_TESTS: true
COMMIT_INFO_MESSAGE: 🌳 ${{ inputs.branch }} 🖥️ ${{ inputs.run-env }} 🤖 ${{ inputs.user }} 🗃️ ${{ inputs.spec }}

# Check if all tests passed and set the output variable
check_testing_matrix:
runs-on: ubuntu-latest
needs: [testing]
outputs:
all_tests_passed: ${{ steps.all_tests_passed.outputs.result }}
steps:
- name: Check all tests passed
id: all_tests_passed
run: |
success=true
for status in ${{ needs.testing.result }}; do
if [ $status != "success" ]; then
success=false
break
fi
done
echo "::set-output name=result::$success"
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
if: always()
steps:
- name: E2E success comment
if: ${{!contains(github.event.pull_request.labels.*.name, 'community') || needs.run-e2e-tests.result == 'success' }}
if: ${{!contains(github.event.pull_request.labels.*.name, 'community') && needs.run-e2e-tests.outputs.tests_passed == 'true' }}
uses: peter-evans/create-or-update-comment@v3
with:
issue-number: ${{ github.event.pull_request.number }}
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
permissions:
contents: write

timeout-minutes: 10
timeout-minutes: 60

steps:
- name: Checkout
Expand All @@ -41,12 +41,19 @@ jobs:
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
pnpm publish -r --publish-branch ${{github.event.pull_request.base.ref}} --access public --tag rc
npm dist-tag rm n8n rc
- name: Create Release
- name: Create a Release on GitHub
uses: ncipollo/release-action@v1
with:
commit: ${{github.event.pull_request.base.ref}}
tag: 'n8n@${{env.RELEASE}}'
prerelease: true
makeLatest: false

- name: Trigger a release note
continue-on-error: true
run: curl -u docsWorkflows:${{ secrets.N8N_WEBHOOK_DOCS_PASSWORD }} --request GET 'https://internal.users.n8n.cloud/webhook/trigger-release-note' --header 'Content-Type:application/json' --data '{"version":"${{env.RELEASE}}"}'

- name: Merge Release into 'master'
run: |
Expand Down
Loading

0 comments on commit f8829a2

Please sign in to comment.