From 78b7136924e875f7a201f0814698dd898e4e63bf Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 17:19:37 +0530 Subject: [PATCH 01/10] docs pr app --- .github/workflows/docs-pr-app.yml | 237 ++++++++++++++++++++++++++++++ docs/previewpr.Dockerfile | 27 ++++ 2 files changed, 264 insertions(+) create mode 100644 .github/workflows/docs-pr-app.yml create mode 100644 docs/previewpr.Dockerfile diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml new file mode 100644 index 0000000000..c770107d65 --- /dev/null +++ b/.github/workflows/docs-pr-app.yml @@ -0,0 +1,237 @@ +name: Render docs review deploy +on: + pull_request_target: + types: [labeled, unlabeled, closed] +env: + PR_NUMBER: ${{ github.event.number }} + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + +permissions: + pull-requests: write + issues: write + +jobs: + create-docs-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-docs-app' }} + runs-on: ubuntu-latest + + steps: + - name: Create deployment + id: create-deployment + run: | + export RESPONSE=$(curl --request POST \ + --url https://api.render.com/v1/services \ + --header 'accept: application/json' \ + --header 'content-type: application/json' \ + --header 'Authorization: Bearer ${{ secrets.RENDER_API_KEY }}' \ + --data ' + { + "autoDeploy": "yes", + "branch": "develop", + "name": "ToolJet PR #12", + "notifyOnFail": "default", + "ownerId": "tea-caeo4bj19n072h3dddc0", + "repo": "${{ github.event.pull_request.head.repo.git_url }}", + "slug": "tooljet-pr-${{ env.PR_NUMBER }}", + "suspended": "not_suspended", + "suspenders": [], + "type": "static_site", + "rootDir": "/docs", + "envVars": [ + { + "key": "NODE_ENV", + "value": "production" + }, + "serviceDetails": { + "buildCommand": "npm run build", + "publishPath": "build", + "openPorts": [{ + "port": 3000, + "protocol": "TCP" + }], + "pullRequestPreviewsEnabled": "no", + "url": "https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com", + "buildEnvironment": { + "nodeVersion": "16.14.2" + } + } + }') + + echo "response: $RESPONSE" + export SERVICE_ID=$(echo $RESPONSE | jq -r '.service.id') + echo "SERVICE_ID=$SERVICE_ID" >> $GITHUB_ENV + + - name: Comment deployment URL + uses: actions/github-script@v5 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Deployment: https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/web/${{ env.SERVICE_ID }}' + }) + + - uses: actions/github-script@v6 + with: + script: | + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'create-review-app' + }) + } catch (e) { + console.log(e) + } + + await github.rest.issues.addLabels({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + labels: ['active-review-app'] + }) + + destroy-docs-app: + if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-docs-app') || github.event.action == 'closed' }} + runs-on: ubuntu-latest + + steps: + - name: Delete service + run: | + export SERVICE_ID=$(curl --request GET \ + --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \ + jq -r '.[0].service.id') + + curl --request DELETE \ + --url https://api.render.com/v1/services/$SERVICE_ID \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' + + - uses: actions/github-script@v6 + with: + script: | + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'destroy-review-app' + }) + } catch (e) { + console.log(e) + } + + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'suspend-review-app' + }) + } catch (e) { + console.log(e) + } + + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'active-review-app' + }) + } catch (e) { + console.log(e) + } + + - name: Install PostgreSQL client + run: | + sudo apt update + sudo apt install postgresql-client -y + + - name: Wait after installing PostgreSQL + run: sleep 25 + + - name: Drop PostgreSQL PR database + env: + PGHOST: ${{ secrets.RENDER_DS_PG_HOST }} + PGPORT: 5432 + PGUSER: ${{ secrets.RENDER_DS_PG_USER }} + PGDATABASE: ${{ env.PR_NUMBER }} + run: | + PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;" + + suspend-docs-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-docs-app' }} + runs-on: ubuntu-latest + + steps: + - name: Suspend service + run: | + export SERVICE_ID=$(curl --request GET \ + --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \ + jq -r '.[0].service.id') + + curl --request POST \ + --url https://api.render.com/v1/services/$SERVICE_ID/suspend \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' + + - uses: actions/github-script@v6 + with: + script: | + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'active-review-app' + }) + } catch (e) { + console.log(e) + } + + resume-docs-app: + if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-docs-app' }} + runs-on: ubuntu-latest + + steps: + - name: Resume service + run: | + export SERVICE_ID=$(curl --request GET \ + --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \ + jq -r '.[0].service.id') + + curl --request POST \ + --url https://api.render.com/v1/services/$SERVICE_ID/resume \ + --header 'accept: application/json' \ + --header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' + + - uses: actions/github-script@v6 + with: + script: | + await github.rest.issues.addLabels({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + labels: ['active-review-app'] + }) + + try { + await github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: 'suspend-review-app' + }) + } catch (e) { + console.log(e) + } diff --git a/docs/previewpr.Dockerfile b/docs/previewpr.Dockerfile new file mode 100644 index 0000000000..b9bf52e4af --- /dev/null +++ b/docs/previewpr.Dockerfile @@ -0,0 +1,27 @@ +# Use the official Node.js image as the base image +FROM node:16.14 + +# Fix for JS heap limit allocation issue +ENV NODE_OPTIONS="--max-old-space-size=4096" + +# Create a working directory for the app +WORKDIR /app + +# Copy your Docusaurus project files into the container +COPY package*.json ./ +COPY docs ./docs +COPY src ./src +COPY static ./static +COPY versioned_docs ./versioned_docs +COPY versioned_sidebars ./versioned_sidebars +COPY babel.config.js ./ +COPY docusaurus.config.js ./ +COPY sidebars.js ./ +COPY versions.json ./ +COPY yarn.lock ./ + +# Install project dependencies +RUN npm install + +# Start the application using npm start +CMD ["npm", "start"] From 67666498d75532134eeea9c243f87bacff7eb0de Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 17:26:11 +0530 Subject: [PATCH 02/10] removed yarn.lock from dockerfile --- docs/previewpr.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/previewpr.Dockerfile b/docs/previewpr.Dockerfile index b9bf52e4af..1491d316ad 100644 --- a/docs/previewpr.Dockerfile +++ b/docs/previewpr.Dockerfile @@ -18,7 +18,6 @@ COPY babel.config.js ./ COPY docusaurus.config.js ./ COPY sidebars.js ./ COPY versions.json ./ -COPY yarn.lock ./ # Install project dependencies RUN npm install From 51efe360c01c1bb37f4558314d3a0bea21c9b9c1 Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 19:50:39 +0530 Subject: [PATCH 03/10] build error fixed --- .github/workflows/docs-pr-app.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index c770107d65..5e2ba5cdf0 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -41,19 +41,28 @@ jobs: { "key": "NODE_ENV", "value": "production" - }, + }, + { + "key": "NODE_VERSION" + "value": "16.18.1." + }, + { + "key": "NPM_VERSION" + "value": "8.19.2" + }, + { + "key": "GA_MID" + "value": "dummy" + } "serviceDetails": { - "buildCommand": "npm run build", - "publishPath": "build", + "buildCommand": "npm i; npm run build", + "publishPath": "/build", "openPorts": [{ "port": 3000, "protocol": "TCP" }], "pullRequestPreviewsEnabled": "no", "url": "https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com", - "buildEnvironment": { - "nodeVersion": "16.14.2" - } } }') From 95b6871ad416ff19b2e472d7a6ff92a58378bf08 Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 20:48:25 +0530 Subject: [PATCH 04/10] corrections --- .github/workflows/docs-pr-app.yml | 45 +++++++++++++------------------ 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 5e2ba5cdf0..7b94b99fc4 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -1,4 +1,4 @@ -name: Render docs review deploy +name: Render review deploy on: pull_request_target: types: [labeled, unlabeled, closed] @@ -11,8 +11,8 @@ permissions: issues: write jobs: - create-docs-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-docs-app' }} + create-review-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-app' }} runs-on: ubuntu-latest steps: @@ -27,8 +27,8 @@ jobs: --data ' { "autoDeploy": "yes", - "branch": "develop", - "name": "ToolJet PR #12", + "branch": "${{ env.BRANCH_NAME }}", + "name": "ToolJet PR #${{ env.PR_NUMBER }}", "notifyOnFail": "default", "ownerId": "tea-caeo4bj19n072h3dddc0", "repo": "${{ github.event.pull_request.head.repo.git_url }}", @@ -36,34 +36,27 @@ jobs: "suspended": "not_suspended", "suspenders": [], "type": "static_site", - "rootDir": "/docs", + "rootDir": "docs", "envVars": [ { "key": "NODE_ENV", "value": "production" }, { - "key": "NODE_VERSION" - "value": "16.18.1." + "key": "NODE_VERSION", + "value": "16.18.1" }, { - "key": "NPM_VERSION" + "key": "ENABLE_MARKETPLACE_FEATURE", "value": "8.19.2" - }, - { - "key": "GA_MID" - "value": "dummy" - } + } + ], "serviceDetails": { "buildCommand": "npm i; npm run build", "publishPath": "/build", - "openPorts": [{ - "port": 3000, - "protocol": "TCP" - }], "pullRequestPreviewsEnabled": "no", - "url": "https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com", - } + "url": "https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com" + } }') echo "response: $RESPONSE" @@ -103,8 +96,8 @@ jobs: labels: ['active-review-app'] }) - destroy-docs-app: - if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-docs-app') || github.event.action == 'closed' }} + destroy-review-app: + if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-app') || github.event.action == 'closed' }} runs-on: ubuntu-latest steps: @@ -174,8 +167,8 @@ jobs: run: | PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;" - suspend-docs-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-docs-app' }} + suspend-review-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-app' }} runs-on: ubuntu-latest steps: @@ -206,8 +199,8 @@ jobs: console.log(e) } - resume-docs-app: - if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-docs-app' }} + resume-review-app: + if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-app' }} runs-on: ubuntu-latest steps: From 0bb19d518efb5dc7db99a4a00d36c83a05a963ab Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 20:53:58 +0530 Subject: [PATCH 05/10] adding stale workflow --- .github/workflows/docs-pr-app.yml | 34 +++++++------- .github/workflows/stale-PR-render-deploys.yml | 45 +++++++++++++++++++ 2 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/stale-PR-render-deploys.yml diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 7b94b99fc4..18bbef4de1 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -1,4 +1,4 @@ -name: Render review deploy +name: Render PR deploy on: pull_request_target: types: [labeled, unlabeled, closed] @@ -11,8 +11,8 @@ permissions: issues: write jobs: - create-review-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-app' }} + create-review-pr-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-pr-app' }} runs-on: ubuntu-latest steps: @@ -83,7 +83,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'create-review-app' + name: 'create-review-pr-app' }) } catch (e) { console.log(e) @@ -93,11 +93,11 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - labels: ['active-review-app'] + labels: ['active-review-pr-app'] }) - destroy-review-app: - if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-app') || github.event.action == 'closed' }} + destroy-review-pr-app: + if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-pr-app') || github.event.action == 'closed' }} runs-on: ubuntu-latest steps: @@ -122,7 +122,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'destroy-review-app' + name: 'destroy-review-pr-app' }) } catch (e) { console.log(e) @@ -133,7 +133,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'suspend-review-app' + name: 'suspend-review-pr-app' }) } catch (e) { console.log(e) @@ -144,7 +144,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'active-review-app' + name: 'active-review-pr-app' }) } catch (e) { console.log(e) @@ -167,8 +167,8 @@ jobs: run: | PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;" - suspend-review-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-app' }} + suspend-review-pr-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-pr-app' }} runs-on: ubuntu-latest steps: @@ -193,14 +193,14 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'active-review-app' + name: 'active-review-pr-app' }) } catch (e) { console.log(e) } - resume-review-app: - if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-app' }} + resume-review-pr-app: + if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-pr-app' }} runs-on: ubuntu-latest steps: @@ -224,7 +224,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - labels: ['active-review-app'] + labels: ['active-review-pr-app'] }) try { @@ -232,7 +232,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'suspend-review-app' + name: 'suspend-review-pr-app' }) } catch (e) { console.log(e) diff --git a/.github/workflows/stale-PR-render-deploys.yml b/.github/workflows/stale-PR-render-deploys.yml new file mode 100644 index 0000000000..f9be11032f --- /dev/null +++ b/.github/workflows/stale-PR-render-deploys.yml @@ -0,0 +1,45 @@ +name: Label for stale PR render deploys +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * *" + +permissions: + issues: write + +jobs: + label-stale-deploys: + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - uses: akshaysasidrn/stale-label-fetch@v1.1 + id: stale-label + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + stale-label: "active-review-pr-app" + stale-time: "86400" + type: "pull_request" + - name: Get stale numbers + run: echo "Matched PR numbers - ${{ steps.stale-label.outputs.stale-numbers }}" + - name: Add suspend label + uses: actions/github-script@v6 + env: + STALE_NUMBERS: ${{ steps.stale-label.outputs.stale-numbers }} + with: + github-token: ${{ secrets.TJ_BOT_PAT }} + script: | + if (!process.env.STALE_NUMBERS) return + + const prNumbers = process.env.STALE_NUMBERS.split(",") + + console.log(`Adding suspend labels for: ${prNumbers}`) + + for (const prNumber of prNumbers) { + github.rest.issues.addLabels({ + issue_number: prNumber, + owner: context.repo.owner, + repo: context.repo.repo, + labels: ['suspend-review-pr-app'] + }) + } From fe71e88b721a378c78cd56f3253f68d9f4255e84 Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 20:55:18 +0530 Subject: [PATCH 06/10] removed dockerfile --- docs/previewpr.Dockerfile | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 docs/previewpr.Dockerfile diff --git a/docs/previewpr.Dockerfile b/docs/previewpr.Dockerfile deleted file mode 100644 index 1491d316ad..0000000000 --- a/docs/previewpr.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Use the official Node.js image as the base image -FROM node:16.14 - -# Fix for JS heap limit allocation issue -ENV NODE_OPTIONS="--max-old-space-size=4096" - -# Create a working directory for the app -WORKDIR /app - -# Copy your Docusaurus project files into the container -COPY package*.json ./ -COPY docs ./docs -COPY src ./src -COPY static ./static -COPY versioned_docs ./versioned_docs -COPY versioned_sidebars ./versioned_sidebars -COPY babel.config.js ./ -COPY docusaurus.config.js ./ -COPY sidebars.js ./ -COPY versions.json ./ - -# Install project dependencies -RUN npm install - -# Start the application using npm start -CMD ["npm", "start"] From f8db1c5048d687f2d187b8542d28713d4f6f5cec Mon Sep 17 00:00:00 2001 From: Adish M Date: Mon, 16 Oct 2023 21:06:16 +0530 Subject: [PATCH 07/10] dashboard url fix --- .github/workflows/docs-pr-app.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 18bbef4de1..59a2bf7cb8 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -72,7 +72,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: 'Deployment: https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/web/${{ env.SERVICE_ID }}' + body: 'Deployment: https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com \n Dashboard: https://dashboard.render.com/static/${{ env.SERVICE_ID }}' }) - uses: actions/github-script@v6 @@ -150,23 +150,6 @@ jobs: console.log(e) } - - name: Install PostgreSQL client - run: | - sudo apt update - sudo apt install postgresql-client -y - - - name: Wait after installing PostgreSQL - run: sleep 25 - - - name: Drop PostgreSQL PR database - env: - PGHOST: ${{ secrets.RENDER_DS_PG_HOST }} - PGPORT: 5432 - PGUSER: ${{ secrets.RENDER_DS_PG_USER }} - PGDATABASE: ${{ env.PR_NUMBER }} - run: | - PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGDATABASE\" ;" - suspend-review-pr-app: if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-pr-app' }} runs-on: ubuntu-latest From c71708e70d8c43eedde7bd33046ec1ce48f59d58 Mon Sep 17 00:00:00 2001 From: Adish M Date: Tue, 17 Oct 2023 09:56:03 +0530 Subject: [PATCH 08/10] npm version fix --- .github/workflows/docs-pr-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 59a2bf7cb8..4b55e306f8 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -47,7 +47,7 @@ jobs: "value": "16.18.1" }, { - "key": "ENABLE_MARKETPLACE_FEATURE", + "key": "NPM_VERSION", "value": "8.19.2" } ], From 5c8ad8afcc05a59aa85be2be3ff1fa3f3768d82a Mon Sep 17 00:00:00 2001 From: Adish M Date: Tue, 17 Oct 2023 11:28:14 +0530 Subject: [PATCH 09/10] fix curl command --- .github/workflows/docs-pr-app.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 4b55e306f8..0cc16fcb7d 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -26,16 +26,12 @@ jobs: --header 'Authorization: Bearer ${{ secrets.RENDER_API_KEY }}' \ --data ' { + "type": "static_site", "autoDeploy": "yes", "branch": "${{ env.BRANCH_NAME }}", "name": "ToolJet PR #${{ env.PR_NUMBER }}", - "notifyOnFail": "default", "ownerId": "tea-caeo4bj19n072h3dddc0", "repo": "${{ github.event.pull_request.head.repo.git_url }}", - "slug": "tooljet-pr-${{ env.PR_NUMBER }}", - "suspended": "not_suspended", - "suspenders": [], - "type": "static_site", "rootDir": "docs", "envVars": [ { @@ -49,12 +45,16 @@ jobs: { "key": "NPM_VERSION", "value": "8.19.2" + }, + { + "key": "GA_MID", + "value": "dummy" } ], "serviceDetails": { - "buildCommand": "npm i; npm run build", - "publishPath": "/build", "pullRequestPreviewsEnabled": "no", + "buildCommand": "npm i && npm run build", + "publishPath": "build/", "url": "https://tooljet-pr-${{ env.PR_NUMBER }}.onrender.com" } }') From 9135a071e84a7387ad7ccac9cd6c776b990c0586 Mon Sep 17 00:00:00 2001 From: Adish M Date: Tue, 17 Oct 2023 11:37:02 +0530 Subject: [PATCH 10/10] changed the label name --- .github/workflows/docs-pr-app.yml | 32 +++++++++---------- ...s.yml => stale-docs-pr-render-deploys.yml} | 6 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) rename .github/workflows/{stale-PR-render-deploys.yml => stale-docs-pr-render-deploys.yml} (89%) diff --git a/.github/workflows/docs-pr-app.yml b/.github/workflows/docs-pr-app.yml index 0cc16fcb7d..69ef9a9306 100644 --- a/.github/workflows/docs-pr-app.yml +++ b/.github/workflows/docs-pr-app.yml @@ -11,8 +11,8 @@ permissions: issues: write jobs: - create-review-pr-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-pr-app' }} + create-review-docs-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'create-review-docs-app' }} runs-on: ubuntu-latest steps: @@ -83,7 +83,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'create-review-pr-app' + name: 'create-review-docs-app' }) } catch (e) { console.log(e) @@ -93,11 +93,11 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - labels: ['active-review-pr-app'] + labels: ['active-review-docs-app'] }) - destroy-review-pr-app: - if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-pr-app') || github.event.action == 'closed' }} + destroy-review-docs-app: + if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'destroy-review-docs-app') || github.event.action == 'closed' }} runs-on: ubuntu-latest steps: @@ -122,7 +122,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'destroy-review-pr-app' + name: 'destroy-review-docs-app' }) } catch (e) { console.log(e) @@ -133,7 +133,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'suspend-review-pr-app' + name: 'suspend-review-docs-app' }) } catch (e) { console.log(e) @@ -144,14 +144,14 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'active-review-pr-app' + name: 'active-review-docs-app' }) } catch (e) { console.log(e) } - suspend-review-pr-app: - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-pr-app' }} + suspend-review-docs-app: + if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-docs-app' }} runs-on: ubuntu-latest steps: @@ -176,14 +176,14 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'active-review-pr-app' + name: 'active-review-docs-app' }) } catch (e) { console.log(e) } - resume-review-pr-app: - if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-pr-app' }} + resume-review-docs-app: + if: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'suspend-review-docs-app' }} runs-on: ubuntu-latest steps: @@ -207,7 +207,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - labels: ['active-review-pr-app'] + labels: ['active-review-docs-app'] }) try { @@ -215,7 +215,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - name: 'suspend-review-pr-app' + name: 'suspend-review-docs-app' }) } catch (e) { console.log(e) diff --git a/.github/workflows/stale-PR-render-deploys.yml b/.github/workflows/stale-docs-pr-render-deploys.yml similarity index 89% rename from .github/workflows/stale-PR-render-deploys.yml rename to .github/workflows/stale-docs-pr-render-deploys.yml index f9be11032f..a8cb4f2a7b 100644 --- a/.github/workflows/stale-PR-render-deploys.yml +++ b/.github/workflows/stale-docs-pr-render-deploys.yml @@ -1,4 +1,4 @@ -name: Label for stale PR render deploys +name: Label for stale Docs PR render deploys on: workflow_dispatch: schedule: @@ -17,7 +17,7 @@ jobs: id: stale-label with: github-token: ${{ secrets.GITHUB_TOKEN }} - stale-label: "active-review-pr-app" + stale-label: "active-review-docs-app" stale-time: "86400" type: "pull_request" - name: Get stale numbers @@ -40,6 +40,6 @@ jobs: issue_number: prNumber, owner: context.repo.owner, repo: context.repo.repo, - labels: ['suspend-review-pr-app'] + labels: ['suspend-review-docs-app'] }) }