summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yaml24
-rw-r--r--extension/src/activation/environmentSetup.ts11
2 files changed, 16 insertions, 19 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 67d248e2..8610f363 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -113,18 +113,18 @@ jobs:
run: |
cd extension
npm run package
- # npx vsce publish patch -p ${{ secrets.VSCE_TOKEN }}
- # - 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]"
-
- # - name: Push changes
- # uses: ad-m/github-push-action@master
- # with:
- # github_token: ${{ secrets.GITHUB_TOKEN }}
- # branch: ${{ github.ref }}
+ npx vsce publish patch -p ${{ secrets.VSCE_TOKEN }}
+ - 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]"
+
+ - name: Push changes
+ uses: ad-m/github-push-action@master
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ branch: ${{ github.ref }}
- name: Upload .vsix artifact
uses: actions/upload-artifact@v2
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 6bfa7d07..a1c4f7ee 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -178,7 +178,7 @@ export async function startContinuePythonServer() {
}
if (shouldDownload) {
- vscode.window.withProgress(
+ await vscode.window.withProgress(
{
location: vscode.ProgressLocation.Notification,
title: "Installing Continue server...",
@@ -194,16 +194,13 @@ export async function startContinuePythonServer() {
// Get name of the corresponding executable for platform
if (os.platform() === "darwin") {
// Add necessary permissions
- const [stdout, stderr] = await runCommand(`chmod +x ${destination}`);
console.log("Setting permissions for Continue server...");
- console.log(stdout);
- console.log(stderr);
+ fs.chmodSync(destination, 0o7_5_5);
const [stdout1, stderr1] = await runCommand(
`xattr -dr com.apple.quarantine ${destination}`
);
- console.log("...");
- console.log(stdout1);
- console.log(stderr1);
+ console.log("stdout: ", stdout1);
+ console.log("stderr: ", stderr1);
}
// Run the executable