Merge branch 'main' into meenu-lekhapremakumar/q-1622-slack-piece-for-specific-mentions-anywhere-on-slack

Author: meenulekha-premakumar

.cursor/mcp.json

@@ -1,7 +1,11 @@
 {
   "mcpServers": {
     "nx-mcp": {
-      "url": "http://localhost:9536/sse"
+      "command": "npx",
+      "args": [
+        "-y",
+        "nx-mcp@latest"
+      ]
     }
   }
 }

.devcontainer/devcontainer.json

@@ -29,5 +29,5 @@
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "yarn install",
 	"remoteUser": "root",
-	"postCreateCommand": "npm ci"
+	"postCreateCommand": "npm i"
 }

.github/workflows/crowdin-pr-merger.yml

@@ -140,7 +140,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: context.issue.number,
-              merge_method: 'merge'
+              merge_method: 'squash'
             });
 
       - name: Delete branch after merge

.github/workflows/release-pieces.yml

@@ -9,6 +9,10 @@ on:
       - 'packages/pieces/**'
       - 'packages/shared/**'
 
+concurrency:
+  group: release-pieces
+  cancel-in-progress: false
+
 jobs:
   Release-Pieces:
     if: github.repository == 'activepieces/activepieces'

.github/workflows/remove-environment.yml

@@ -0,0 +1,30 @@
+name: Remove Environment
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  Remove-Preview-Environment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure SSH
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_KEY" > ~/.ssh/preview-server.key
+          chmod 600 ~/.ssh/preview-server.key
+          cat >>~/.ssh/config <<END
+          Host preview-server
+            HostName $SSH_HOST
+            User $SSH_USER
+            IdentityFile ~/.ssh/preview-server.key
+            StrictHostKeyChecking no
+          END
+        env:
+          SSH_USER: ${{ secrets.PRE_PROD_USERNAME }}
+          SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
+          SSH_HOST: ${{ secrets.PREVIEW_HOST }}
+
+      - name: Remove Environment
+        run: |
+          ssh preview-server -t -t 'bash -ic "cd /root/environments && node index.js remove ${{ github.head_ref }}; exit"'

.github/workflows/setup-environment.yml

@@ -0,0 +1,66 @@
+name: Setup Environment
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, edited, closed, labeled]
+
+concurrency:
+  group: setup-environment
+  cancel-in-progress: false
+
+jobs:
+  Setup-Preview-Environment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Configure SSH
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_KEY" > ~/.ssh/preview-server.key
+          chmod 600 ~/.ssh/preview-server.key
+          cat >>~/.ssh/config <<END
+          Host preview-server
+            HostName $SSH_HOST
+            User $SSH_USER
+            IdentityFile ~/.ssh/preview-server.key
+            StrictHostKeyChecking no
+          END
+        env:
+          SSH_USER: ${{ secrets.PRE_PROD_USERNAME }}
+          SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
+          SSH_HOST: ${{ secrets.PREVIEW_HOST }}
+
+      - name: Check if PR has preview label
+        id: check-label
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            const hasPreviewLabel = labels.includes('preview');
+            
+            console.log('PR labels:', labels);
+            console.log('Has preview label:', hasPreviewLabel);
+            
+            core.setOutput('should-setup', hasPreviewLabel);
+            return hasPreviewLabel;
+          
+      - name: Setup Environment
+        id: setup
+        if: steps.check-label.outputs.should-setup == 'true'
+        run: |
+          ssh preview-server -t -t 'bash -ic "cd /root/environments && node index.js setup ${{ github.head_ref }}; exit"'
+          echo "environment_url=https://$(echo '${{ github.head_ref }}' | sed 's|/|-|g').preview.activepieces.dev" >> $GITHUB_OUTPUT
+
+      - name: Comment on PR
+        if: steps.check-label.outputs.should-setup == 'true'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '🚀 Preview environment has been set up!\n\n**Environment URL:** ${{ steps.setup.outputs.environment_url }}\n\nThe preview environment for branch `${{ github.head_ref }}` is now ready for testing.'
+            })

.github/workflows/unified-automate-deploy.yml

@@ -66,6 +66,10 @@ jobs:
         run: |
           ssh pre-prod -t -t 'bash -ic "cd activepieces && IMAGE_TAG=testing docker compose pull && IMAGE_TAG=testing docker compose up -d --force-recreate activepieces; exit"' 
 
+      - name: Clean up unused Docker images
+        run: |
+          ssh pre-prod -t -t 'bash -ic "docker image prune -a -f; exit"'
+
       - name: Docker system prune
         run: docker system prune -a -f
 

.github/workflows/validate-pr-labels.yml

@@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         procps && \
     yarn config set python /usr/bin/python3 && \
     npm install -g node-gyp
-RUN npm i -g npm@9.9.3 pnpm@9.15.0
+RUN npm i -g npm@9.9.3 pnpm@9.15.0 pm2@6.0.10
 
 # Set the locale
 ENV LANG en_US.UTF-8

Dockerfile

@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   activepieces:
-    image: ghcr.io/activepieces/activepieces:0.68.2
+    image: ghcr.io/activepieces/activepieces:0.69.0
     container_name: activepieces
     restart: unless-stopped
     ## Enable the following line if you already use AP_EXECUTION_MODE with SANDBOXED or old activepieces, checking the breaking change documentation for more info.