From c1280d60cf9697eb36b101c18283b6982bb67931 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 11:42:55 +0000 Subject: [PATCH 1/9] 1 --- .github/workflows/preview.yml | 35 +- .github/workflows/workspace.yml | 4 +- scripting/DummyServer/build.sh | 3 - scripting/DummyServer/index.js | 15 - scripting/DummyServer/package-lock.json | 773 ------------------ scripting/DummyServer/package.json | 16 - scripting/DummyServer/vcr.yml | 9 - .../.vscode/cleanup.sh | 0 .../.vscode/envs.sh | 0 .../.vscode/ofos.json | 2 +- .../.vscode/settings.json | 0 .../.vscode/tasks.json | 0 .../setup.json | 0 .../vcr.yml | 0 scripting/createWorkspace.sh | 7 +- .../messages_api-sms/tutorial-config.json | 3 +- 16 files changed, 18 insertions(+), 849 deletions(-) delete mode 100644 scripting/DummyServer/build.sh delete mode 100644 scripting/DummyServer/index.js delete mode 100644 scripting/DummyServer/package-lock.json delete mode 100644 scripting/DummyServer/package.json delete mode 100644 scripting/DummyServer/vcr.yml rename scripting/{DummyWorkspace => TemplateWorkspace}/.vscode/cleanup.sh (100%) rename scripting/{DummyWorkspace => TemplateWorkspace}/.vscode/envs.sh (100%) rename scripting/{DummyWorkspace => TemplateWorkspace}/.vscode/ofos.json (75%) rename scripting/{DummyWorkspace => TemplateWorkspace}/.vscode/settings.json (100%) rename scripting/{DummyWorkspace => TemplateWorkspace}/.vscode/tasks.json (100%) rename scripting/{DummyWorkspace => TemplateWorkspace}/setup.json (100%) rename scripting/{DummyWorkspace => TemplateWorkspace}/vcr.yml (100%) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 190d6aa..6265efa 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -63,33 +63,18 @@ jobs: mkdir -p ./public cp -r ./dist/* ./public rm -rf dist - cp -r $GITHUB_WORKSPACE/scripting/DummyServer/* . NAME=$(jq -r '.slug' tutorial-config.json) - sed -i "s//$NAME/g" vcr.yml - sed -i "s//preview/g" vcr.yml - cat vcr.yml - - name: Install Cloud Runtime CLI - uses: Vonage/cloud-runtime-cli@main - - name: Deploy - id: deploy - working-directory: ${{ steps.get-changed-folder.outputs.dir }} - run: | - vcr deploy --api-key ${{ vars.VONAGE_API_KEY }} --api-secret ${{ secrets.VONAGE_API_SECRET }} --region aws.${{ vars.VCR_REGION }} --graphql-endpoint https://graphql.${{ vars.VCR_REGION }}.runtime.vonage.cloud/v1/graphql 2>&1 | tee deploy-vcr-logs.log - url=$(grep -oP 'https://neru-\S+' deploy-vcr-logs.log) - sanitized_url=$(echo "$url" | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g") - echo "url=$sanitized_url" >> "$GITHUB_OUTPUT" - - - name: Leave comment on PR - uses: actions/github-script@v7 - with: - script: | - await github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Your Tutorial Preview has been deployed: ${{ steps.deploy.outputs.url }}' - }); + # - name: Leave comment on PR + # uses: actions/github-script@v7 + # with: + # script: | + # await github.rest.issues.createComment({ + # issue_number: context.issue.number, + # owner: context.repo.owner, + # repo: context.repo.repo, + # body: 'Your Tutorial Preview has been deployed: ${{ steps.deploy.outputs.url }}' + # }); diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 7d1f2cc..283e427 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -63,7 +63,7 @@ jobs: mkdir -p ./public cp -r ../dist/* ./public rm -rf ../dist - cp -r $GITHUB_WORKSPACE/scripting/DummyServer/* . + cp -r $GITHUB_WORKSPACE/scripting/TemplateServer/* . NAME=$(jq -r '.slug' ../tutorial-config.json) VERSION=$(jq -r '.version' ../tutorial-config.json) @@ -93,7 +93,7 @@ jobs: cd ws pwd cp ../tutorial-config.json . - cp -r $GITHUB_WORKSPACE/scripting/DummyWorkspace/. . + cp -r $GITHUB_WORKSPACE/scripting/TemplateWorkspace/. . cp $GITHUB_WORKSPACE/scripting/createWorkspace.sh . ls -a ./createWorkspace.sh ${{ steps.deploy.outputs.url }} diff --git a/scripting/DummyServer/build.sh b/scripting/DummyServer/build.sh deleted file mode 100644 index 77e86f9..0000000 --- a/scripting/DummyServer/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -npm ci \ No newline at end of file diff --git a/scripting/DummyServer/index.js b/scripting/DummyServer/index.js deleted file mode 100644 index 6e6a352..0000000 --- a/scripting/DummyServer/index.js +++ /dev/null @@ -1,15 +0,0 @@ -import express from 'express'; - -const app = express(); -const port = process.env.VCR_PORT; - -app.use(express.json()); -app.use(express.static('public')); - -app.get('/_/health', async (req, res) => { - res.sendStatus(200); -}); - -app.listen(port, () => { - console.log(`App listening on port ${port}`) -}); \ No newline at end of file diff --git a/scripting/DummyServer/package-lock.json b/scripting/DummyServer/package-lock.json deleted file mode 100644 index 3675cbb..0000000 --- a/scripting/DummyServer/package-lock.json +++ /dev/null @@ -1,773 +0,0 @@ -{ - "name": "helloworld", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "helloworld", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "express": "^4.18.2" - } - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "license": "MIT" - }, - "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "license": "MIT" - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "license": "MIT" - }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "license": "MIT" - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "license": "MIT", - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "license": "MIT", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/object-inspect": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", - "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", - "license": "MIT" - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" - }, - "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "license": "MIT", - "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "license": "MIT", - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" - }, - "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "license": "MIT", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - } - } -} diff --git a/scripting/DummyServer/package.json b/scripting/DummyServer/package.json deleted file mode 100644 index bb05fc3..0000000 --- a/scripting/DummyServer/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "helloworld", - "type": "module", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "start": "node index.js", - "debug": "vcr debug" - }, - "author": "", - "license": "ISC", - "dependencies": { - "express": "^4.18.2" - } -} diff --git a/scripting/DummyServer/vcr.yml b/scripting/DummyServer/vcr.yml deleted file mode 100644 index 9178fc5..0000000 --- a/scripting/DummyServer/vcr.yml +++ /dev/null @@ -1,9 +0,0 @@ -project: - name: -instance: - name: - runtime: nodejs22 - region: aws.euw1 - application-id: 6b3dc652-f374-47eb-856e-5e846a975f5e - build-script: "./build.sh" - entrypoint: [npm, run, start] \ No newline at end of file diff --git a/scripting/DummyWorkspace/.vscode/cleanup.sh b/scripting/TemplateWorkspace/.vscode/cleanup.sh similarity index 100% rename from scripting/DummyWorkspace/.vscode/cleanup.sh rename to scripting/TemplateWorkspace/.vscode/cleanup.sh diff --git a/scripting/DummyWorkspace/.vscode/envs.sh b/scripting/TemplateWorkspace/.vscode/envs.sh similarity index 100% rename from scripting/DummyWorkspace/.vscode/envs.sh rename to scripting/TemplateWorkspace/.vscode/envs.sh diff --git a/scripting/DummyWorkspace/.vscode/ofos.json b/scripting/TemplateWorkspace/.vscode/ofos.json similarity index 75% rename from scripting/DummyWorkspace/.vscode/ofos.json rename to scripting/TemplateWorkspace/.vscode/ofos.json index 06dc0f3..52c8a4f 100644 --- a/scripting/DummyWorkspace/.vscode/ofos.json +++ b/scripting/TemplateWorkspace/.vscode/ofos.json @@ -1,6 +1,6 @@ { "enabled": true, "startupfiles": [ - "" + ] } \ No newline at end of file diff --git a/scripting/DummyWorkspace/.vscode/settings.json b/scripting/TemplateWorkspace/.vscode/settings.json similarity index 100% rename from scripting/DummyWorkspace/.vscode/settings.json rename to scripting/TemplateWorkspace/.vscode/settings.json diff --git a/scripting/DummyWorkspace/.vscode/tasks.json b/scripting/TemplateWorkspace/.vscode/tasks.json similarity index 100% rename from scripting/DummyWorkspace/.vscode/tasks.json rename to scripting/TemplateWorkspace/.vscode/tasks.json diff --git a/scripting/DummyWorkspace/setup.json b/scripting/TemplateWorkspace/setup.json similarity index 100% rename from scripting/DummyWorkspace/setup.json rename to scripting/TemplateWorkspace/setup.json diff --git a/scripting/DummyWorkspace/vcr.yml b/scripting/TemplateWorkspace/vcr.yml similarity index 100% rename from scripting/DummyWorkspace/vcr.yml rename to scripting/TemplateWorkspace/vcr.yml diff --git a/scripting/createWorkspace.sh b/scripting/createWorkspace.sh index 7c02b28..3f6e5b8 100755 --- a/scripting/createWorkspace.sh +++ b/scripting/createWorkspace.sh @@ -19,7 +19,6 @@ fi SLUG=$(jq -r '.slug' "$CONFIG_FILE") VERSION=$(jq -r '.version' "$CONFIG_FILE") FILES=$(jq -r '.files[]' "$CONFIG_FILE") -OPEN_FILE=$(jq -r '.openFile' "$CONFIG_FILE") # Create files from the "files" array for FILE in $FILES; do @@ -45,8 +44,10 @@ fi OFOS_FILE=".vscode/ofos.json" if [ -f "$OFOS_FILE" ]; then TEMP_FILE=$(mktemp) - sed "s||$OPEN_FILE|" "$OFOS_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$OFOS_FILE" - echo "Updated $OFOS_FILE with openFile: $OPEN_FILE" + FILES_ARRAY=$(printf '"%s",' $FILES) + FILES_ARRAY="[${FILES_ARRAY%,}]" + sed "s||$FILES_ARRAY|" "$OFOS_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$OFOS_FILE" + echo "Updated $OFOS_FILE with files: $FILES_ARRAY" else echo "$OFOS_FILE not found." fi \ No newline at end of file diff --git a/tutorials/messages_api-sms/tutorial-config.json b/tutorials/messages_api-sms/tutorial-config.json index d143289..9451a38 100644 --- a/tutorials/messages_api-sms/tutorial-config.json +++ b/tutorials/messages_api-sms/tutorial-config.json @@ -4,10 +4,9 @@ "files": [ "send-sms.js" ], - "openFile": "send-sms.js", "panels": [ "terminal", "browser" ], - "version": "0.1" + "version": "0.2" } \ No newline at end of file From b25e48abf9035919eb6ff05af0345599269ce825 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 11:49:46 +0000 Subject: [PATCH 2/9] test --- .github/workflows/preview.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 6265efa..75d8ee9 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -60,12 +60,13 @@ jobs: run: | shopt -s extglob rm -rf !(dist|tutorial-config.json) - mkdir -p ./public - cp -r ./dist/* ./public + mkdir -p ./preview + cp -r ./dist/* ./preview rm -rf dist NAME=$(jq -r '.slug' tutorial-config.json) + ls # - name: Leave comment on PR From 0f81c72f25291d8a7502579591ed1c45180d147b Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 11:52:19 +0000 Subject: [PATCH 3/9] test --- .github/workflows/preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 75d8ee9..3473dc1 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -60,12 +60,12 @@ jobs: run: | shopt -s extglob rm -rf !(dist|tutorial-config.json) + mkdir -p ./preview cp -r ./dist/* ./preview + mv tutorial-config.json ./preview/ rm -rf dist - NAME=$(jq -r '.slug' tutorial-config.json) - ls From 6b3d265eba29af7b51898669c0b3be4083d21b8a Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 11:54:08 +0000 Subject: [PATCH 4/9] test --- .github/workflows/preview.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 3473dc1..3ab8d57 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -68,6 +68,13 @@ jobs: ls + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" + publish_branch: gh_pages + # - name: Leave comment on PR # uses: actions/github-script@v7 From 2d768349913cb5bedced1ec76e358ebe2aff6d36 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 12:01:51 +0000 Subject: [PATCH 5/9] test --- .github/workflows/preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 3ab8d57..3627175 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -72,6 +72,7 @@ jobs: uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} + destination_dir: "${{ steps.get-changed-folder.outputs.dir }}" publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" publish_branch: gh_pages From 594ff436004ec2a20ff9aae7d3404e015e1dc639 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 12:07:38 +0000 Subject: [PATCH 6/9] test --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 3627175..5039183 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -72,7 +72,7 @@ jobs: uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} - destination_dir: "${{ steps.get-changed-folder.outputs.dir }}" + destination_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" publish_branch: gh_pages From edd6fddf041199bbbcec9be6b6398f9edf9a0861 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 12:17:47 +0000 Subject: [PATCH 7/9] test --- .github/workflows/preview.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 5039183..72b9af3 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -77,13 +77,13 @@ jobs: publish_branch: gh_pages - # - name: Leave comment on PR - # uses: actions/github-script@v7 - # with: - # script: | - # await github.rest.issues.createComment({ - # issue_number: context.issue.number, - # owner: context.repo.owner, - # repo: context.repo.repo, - # body: 'Your Tutorial Preview has been deployed: ${{ steps.deploy.outputs.url }}' - # }); + - name: Leave comment on PR + uses: actions/github-script@v7 + with: + script: | + await github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Your Tutorial Preview has been deployed: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/${{ steps.get-changed-folder.outputs.dir }}/preview' + }); From e5c595610f6bbbb77ce793b081853745767eeebd Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 12:29:41 +0000 Subject: [PATCH 8/9] test --- .github/workflows/preview.yml | 18 ++------------ .github/workflows/workspace.yml | 42 ++++++++++----------------------- 2 files changed, 15 insertions(+), 45 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 72b9af3..570fed9 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -55,27 +55,13 @@ jobs: run: | npm run build - - name: Prep deploy - working-directory: ${{ steps.get-changed-folder.outputs.dir }} - run: | - shopt -s extglob - rm -rf !(dist|tutorial-config.json) - - mkdir -p ./preview - cp -r ./dist/* ./preview - mv tutorial-config.json ./preview/ - rm -rf dist - - ls - - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} - destination_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" - publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" + publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/dist" publish_branch: gh_pages - + destination_dir: "${{ steps.get-changed-folder.outputs.dir }}/preview" - name: Leave comment on PR uses: actions/github-script@v7 diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 283e427..29aae37 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -56,47 +56,33 @@ jobs: npm run build - name: Prep deploy + id: prep-deploy working-directory: ${{ steps.get-changed-folder.outputs.dir }} - run: | - mkdir -p server - cd server - mkdir -p ./public - cp -r ../dist/* ./public - rm -rf ../dist - cp -r $GITHUB_WORKSPACE/scripting/TemplateServer/* . - + run: | NAME=$(jq -r '.slug' ../tutorial-config.json) VERSION=$(jq -r '.version' ../tutorial-config.json) - VERSION=${VERSION//./-} - sed -i "s//$NAME/g" vcr.yml - sed -i "s//$VERSION/g" vcr.yml - - cat vcr.yml - - name: Install Cloud Runtime CLI - uses: Vonage/cloud-runtime-cli@main + echo "version=$VERSION" >> "$GITHUB_OUTPUT" + echo "name=$NAME" >> "$GITHUB_OUTPUT" - - name: Deploy - id: deploy - working-directory: ${{ steps.get-changed-folder.outputs.dir }}/server - run: | - vcr deploy --api-key ${{ vars.VONAGE_API_KEY }} --api-secret ${{ secrets.VONAGE_API_SECRET }} --region aws.${{ vars.VCR_REGION }} --graphql-endpoint https://graphql.${{ vars.VCR_REGION }}.runtime.vonage.cloud/v1/graphql 2>&1 | tee deploy-vcr-logs.log - url=$(grep -oP 'https://neru-\S+' deploy-vcr-logs.log) - sanitized_url=$(echo "$url" | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g") - echo "url=$sanitized_url" >> "$GITHUB_OUTPUT" + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: "${{ steps.get-changed-folder.outputs.dir }}/dist" + publish_branch: gh_pages + destination_dir: "${{ steps.get-changed-folder.outputs.dir }}/${{ steps.prep-deploy.outputs.version }}" - name: Create Workspace Folder working-directory: ${{ steps.get-changed-folder.outputs.dir }} run: | - rm -rf server ws mkdir -p ws cd ws - pwd cp ../tutorial-config.json . cp -r $GITHUB_WORKSPACE/scripting/TemplateWorkspace/. . cp $GITHUB_WORKSPACE/scripting/createWorkspace.sh . ls -a - ./createWorkspace.sh ${{ steps.deploy.outputs.url }} + ./createWorkspace.sh https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/${{ steps.get-changed-folder.outputs.dir }}/${{ steps.prep-deploy.outputs.version }} - name: Tag the commit id: tag-commit @@ -106,9 +92,7 @@ jobs: git config user.email "actions@github.com" git add --all - slug=$(jq -r '.slug' tutorial-config.json) - version=$(jq -r '.version' tutorial-config.json) - TAG_NAME="${slug}-v${version}" + TAG_NAME="${{ steps.prep-deploy.outputs.name }}-v${{ steps.prep-deploy.outputs.version }}" git commit -m "Adding workspace for ${TAG_NAME}" git tag -a $TAG_NAME -m "Tagging commit for version ${TAG_NAME}" From 2717f3267a3743558d7a0f01f03c8f7cba935cf5 Mon Sep 17 00:00:00 2001 From: Abdulhakim Ajetunmobi Date: Tue, 26 Nov 2024 13:21:45 +0000 Subject: [PATCH 9/9] scripting fixes --- .github/workflows/workspace.yml | 6 +++--- scripting/TemplateWorkspace/.vscode/ofos.json | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 29aae37..2d33e2e 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -59,8 +59,8 @@ jobs: id: prep-deploy working-directory: ${{ steps.get-changed-folder.outputs.dir }} run: | - NAME=$(jq -r '.slug' ../tutorial-config.json) - VERSION=$(jq -r '.version' ../tutorial-config.json) + NAME=$(jq -r '.slug' ./tutorial-config.json) + VERSION=$(jq -r '.version' ./tutorial-config.json) echo "version=$VERSION" >> "$GITHUB_OUTPUT" echo "name=$NAME" >> "$GITHUB_OUTPUT" @@ -123,4 +123,4 @@ jobs: name: Release ${{ steps.tag-commit.outputs.tag_name }} artifacts: "${{ steps.get-changed-folder.outputs.dir }}/ws/ws.zip" body: Download and Upload the ws.zip file to Code Hub now. - tag: ${{ steps.tag-commit.outputs.tag_name }} + tag: ${{ steps.tag-commit.outputs.tag_name }} \ No newline at end of file diff --git a/scripting/TemplateWorkspace/.vscode/ofos.json b/scripting/TemplateWorkspace/.vscode/ofos.json index 52c8a4f..db5783e 100644 --- a/scripting/TemplateWorkspace/.vscode/ofos.json +++ b/scripting/TemplateWorkspace/.vscode/ofos.json @@ -1,6 +1,4 @@ { "enabled": true, - "startupfiles": [ - - ] + "startupfiles": } \ No newline at end of file