From c1a8097f0a7f3cddb0aebac26e6197ffef186972 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 19:58:09 -0700 Subject: fix: :bug: attempting to fix mkdir --- extension/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extension/package.json') diff --git a/extension/package.json b/extension/package.json index e887dc7a..ea4d8c16 100644 --- a/extension/package.json +++ b/extension/package.json @@ -195,7 +195,7 @@ "lint": "eslint src --ext ts", "build-test": "tsc && node esbuild.test.mjs", "test": "npm run build-test && node ./out/test-runner/runTestOnVSCodeHost.js", - "package": "npm install && npm run typegen && npm run clientgen && cd react-app && npm install && npm run build && cd .. && mkdir -p ./build && vsce package --out ./build" + "package": "npm install && npm run typegen && npm run clientgen && cd react-app && npm install && npm run build && cd .. && mkdir build && vsce package --out ./build" }, "devDependencies": { "@nestjs/common": "^8.4.7", -- cgit v1.2.3-70-g09d2 From 4636c9590154d6b5995948003da212eb25003750 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 20:56:11 -0700 Subject: fix: :bug: write out npm run package as package.js --- extension/package.json | 2 +- extension/scripts/package.js | 40 +++++++++++++++++++++++ extension/src/test-suite/environmentSetup.test.ts | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 extension/scripts/package.js (limited to 'extension/package.json') diff --git a/extension/package.json b/extension/package.json index ea4d8c16..7cf2bc7d 100644 --- a/extension/package.json +++ b/extension/package.json @@ -195,7 +195,7 @@ "lint": "eslint src --ext ts", "build-test": "tsc && node esbuild.test.mjs", "test": "npm run build-test && node ./out/test-runner/runTestOnVSCodeHost.js", - "package": "npm install && npm run typegen && npm run clientgen && cd react-app && npm install && npm run build && cd .. && mkdir build && vsce package --out ./build" + "package": "node scripts/package.js" }, "devDependencies": { "@nestjs/common": "^8.4.7", diff --git a/extension/scripts/package.js b/extension/scripts/package.js new file mode 100644 index 00000000..4703ebc2 --- /dev/null +++ b/extension/scripts/package.js @@ -0,0 +1,40 @@ +const { exec } = require("child_process"); +const fs = require("fs"); + +exec("npm install", (error) => { + if (error) throw error; + console.log("npm install completed"); + + exec("npm run typegen", (error) => { + if (error) throw error; + console.log("npm run typegen completed"); + + exec("npm run clientgen", (error) => { + if (error) throw error; + console.log("npm run clientgen completed"); + + process.chdir("react-app"); + + exec("npm install", (error) => { + if (error) throw error; + console.log("npm install in react-app completed"); + + exec("npm run build", (error) => { + if (error) throw error; + console.log("npm run build in react-app completed"); + + process.chdir(".."); + + if (!fs.existsSync("build")) { + fs.mkdirSync("build"); + } + + exec("vsce package --out ./build", (error) => { + if (error) throw error; + console.log("vsce package completed"); + }); + }); + }); + }); + }); +}); diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts index a6aa3433..a0d6cbaa 100644 --- a/extension/src/test-suite/environmentSetup.test.ts +++ b/extension/src/test-suite/environmentSetup.test.ts @@ -9,7 +9,7 @@ import fkill from "fkill"; describe("Can start python server", () => { test("Can start python server in under 10 seconds", async function () { fkill(65432, { force: true, silent: true }); - const allowedTime = 10_000; + const allowedTime = 15_000; this.timeout(allowedTime + 1000); // If successful, the server is started by the extension while we wait -- cgit v1.2.3-70-g09d2 From a131c17326591e67a68faf6f96371ad8fc332b71 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 22:58:07 -0700 Subject: fix: :green_heart: publishing to depend on ALL tests --- .github/workflows/main.yaml | 66 ++++++++++++++++++++++++++++++--------------- extension/package.json | 2 +- 2 files changed, 46 insertions(+), 22 deletions(-) (limited to 'extension/package.json') diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9bc05281..99b30201 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -45,7 +45,7 @@ jobs: name: ${{ runner.os }} Build path: dist/* - test-and-publish-extension: + test-and-package: needs: pyinstaller strategy: matrix: @@ -135,42 +135,66 @@ jobs: npm run test if: matrix.os != 'ubuntu-20.04' - # Publish the extension and commit/push the version change (ONLY on ubuntu-20.04) + # Upload .vsix artifact + + - name: Upload .vsix as an artifact + uses: actions/upload-artifact@v2 + with: + name: vsix-artifact + path: extension/build/* + if: matrix.os == 'ubuntu-20.04' + + publish: + needs: test-and-package + runs-on: ubuntu-20.04 + permissions: + contents: write + + steps: + # Checkout and download .vsix artifact + + - name: Checkout + uses: actions/checkout@v2 + + - name: Download .vsix artifact + uses: actions/download-artifact@v2 + with: + name: vsix-artifact + path: extension/build + + # Publish the extension and commit/push the version change + + - name: Use Node.js 19.0.0 + uses: actions/setup-node@v3 + with: + node-version: 19.0.0 + + - name: Cache extension node_modules + uses: actions/cache@v2 + with: + path: extension/node_modules + key: ${{ runner.os }}-node-${{ hashFiles('extension/package-lock.json') }} + + - name: Install extension Dependencies + run: | + cd extension + npm ci - name: Publish run: | cd extension npx vsce publish patch -p ${{ secrets.VSCE_TOKEN }} - if: matrix.os == 'ubuntu-20.04' - - name: Commit changes run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -am "ci: 💚 Update package.json version [skip ci]" - if: matrix.os == 'ubuntu-20.04' - - name: Push changes uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ github.ref }} - if: matrix.os == 'ubuntu-20.04' - - name: Upload .vsix as an artifact - uses: actions/upload-artifact@v2 - with: - name: vsix-artifact - path: extension/build/* - if: matrix.os == 'ubuntu-20.04' - - publish-binaries: - needs: test-and-publish-extension - runs-on: ubuntu-20.04 - permissions: - contents: write - - steps: # Download binaries and upload to S3 - name: Download Linux build diff --git a/extension/package.json b/extension/package.json index 7cf2bc7d..5db72fd5 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.289", + "version": "0.0.290", "publisher": "Continue", "engines": { "vscode": "^1.67.0" -- cgit v1.2.3-70-g09d2 From 0a98c5b312c69079b7bba07b93f2dcb1d609e5a4 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 10 Aug 2023 09:15:12 +0000 Subject: ci: 💚 Update package.json version [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'extension/package.json') diff --git a/extension/package-lock.json b/extension/package-lock.json index 610d4b45..cda38826 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.292", + "version": "0.0.293", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.292", + "version": "0.0.293", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index 9eb18355..cd536858 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.292", + "version": "0.0.293", "publisher": "Continue", "engines": { "vscode": "^1.67.0" -- cgit v1.2.3-70-g09d2 From 5438ce94406baa0f7d131ecacadefc72912dca0d Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Thu, 10 Aug 2023 14:16:52 -0700 Subject: fix: :green_heart: remove version from apckage.json --- extension/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'extension/package.json') diff --git a/extension/package.json b/extension/package.json index 0466dd99..2e128e99 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,6 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.296", "publisher": "Continue", "engines": { "vscode": "^1.67.0" -- cgit v1.2.3-70-g09d2 From d8327ec6f82058479bd294bfcdccaf3c2b54de0a Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Thu, 10 Aug 2023 23:25:12 -0700 Subject: fix: :green_heart: remove "patch" from vsce publish command --- .github/workflows/main.yaml | 2 +- extension/package-lock.json | 1 + extension/package.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'extension/package.json') diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ddfe9288..a114c7c9 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -183,7 +183,7 @@ jobs: - name: Publish run: | cd extension - npx vsce publish patch -p ${{ secrets.VSCE_TOKEN }} --packagePath ./build/*.vsix + npx vsce publish -p ${{ secrets.VSCE_TOKEN }} --packagePath ./build/*.vsix - name: Commit changes run: | diff --git a/extension/package-lock.json b/extension/package-lock.json index b64513ec..97451b1a 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,5 +1,6 @@ { "name": "continue", + "version": "0.0.297", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/extension/package.json b/extension/package.json index 2e128e99..07af8a59 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,6 +1,7 @@ { "name": "continue", "icon": "media/terminal-continue.png", + "version": "0.0.297", "repository": { "type": "git", "url": "https://github.com/continuedev/continue" -- cgit v1.2.3-70-g09d2 From 1936f725d226bea2e13d5d88c1dd7a9a02ddd259 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Fri, 11 Aug 2023 13:34:14 -0700 Subject: fix: :bug: version patch in the publish step --- .github/workflows/main.yaml | 5 +++++ extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'extension/package.json') diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a114c7c9..a3927f3f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -185,6 +185,11 @@ jobs: cd extension npx vsce publish -p ${{ secrets.VSCE_TOKEN }} --packagePath ./build/*.vsix + - name: Update version in package.json + run: | + cd extension + npm version patch + - name: Commit changes run: | git config --local user.email "action@github.com" diff --git a/extension/package-lock.json b/extension/package-lock.json index 97451b1a..be8873b3 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.297", + "version": "0.0.298", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.296", + "version": "0.0.298", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index 07af8a59..dfc281c3 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,7 +1,7 @@ { "name": "continue", "icon": "media/terminal-continue.png", - "version": "0.0.297", + "version": "0.0.298", "repository": { "type": "git", "url": "https://github.com/continuedev/continue" -- cgit v1.2.3-70-g09d2 From 9e6419b36019987e9aea2b0aa02fe9792ca537dd Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 11 Aug 2023 20:42:18 +0000 Subject: ci: 💚 Update package.json version [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'extension/package.json') diff --git a/extension/package-lock.json b/extension/package-lock.json index be8873b3..19d91123 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.298", + "version": "0.0.299", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.298", + "version": "0.0.299", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index dfc281c3..c5fc5b67 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,7 +1,7 @@ { "name": "continue", "icon": "media/terminal-continue.png", - "version": "0.0.298", + "version": "0.0.299", "repository": { "type": "git", "url": "https://github.com/continuedev/continue" -- cgit v1.2.3-70-g09d2