Adds package ci for vscode extension.

posit-dev · Nov 17, 2023 · 8ead7da · 8ead7da
1 parent 15a6fd1
commit 8ead7da
Show file tree

Hide file tree

Showing 27 changed files with 60 additions and 20 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -21,4 +21,4 @@ jobs:
   jupyterlab:
     uses: ./.github/workflows/jupyterlab.yaml
   positron:
-    uses: ./.github/workflows/positron.yaml
+    uses: ./.github/workflows/vscode.yaml
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -0,0 +1,20 @@
+name: Main
+on:
+  push:
+    branches:
+      - tdstein/347
+jobs:
+  vscode:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: ./.github/actions/setup
+      - run: just vscode install
+      - run: just vscode package $(just name) $(just version) $(pwd)
+      - uses: actions/upload-artifact@v3
+        id: upload
+        with:
+          name: extensions
+          path: *.vsix
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -22,4 +22,4 @@ jobs:
   jupyterlab:
     uses: ./.github/workflows/jupyterlab.yaml
   positron:
-    uses: ./.github/workflows/positron.yaml
+    uses: ./.github/workflows/vscode.yaml
diff --git a/.github/workflows/positron.yaml → .github/workflows/vscode.yaml b/.github/workflows/positron.yaml → .github/workflows/vscode.yaml
@@ -1,4 +1,4 @@
-name: Positron
+name: VSCode
 on:
   workflow_call:
 jobs:
@@ -18,16 +18,16 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18.x
-      - run: just positron install
-      - run: just positron lint
-      - run: just positron test
+      - run: just vscode install
+      - run: just vscode lint
+      - run: just vscode test
   docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ./.github/actions/setup
-      - run: just positron install
-      - run: just positron lint
-      - run: just positron test
+      - run: just vscode install
+      - run: just vscode lint
+      - run: just vscode test
diff --git a/extensions/positron/.eslintrc.json → extensions/vscode/.eslintrc.json b/extensions/positron/.eslintrc.json → extensions/vscode/.eslintrc.json
diff --git a/extensions/positron/.gitignore → extensions/vscode/.gitignore b/extensions/positron/.gitignore → extensions/vscode/.gitignore
diff --git a/extensions/positron/.vscode/extensions.json → extensions/vscode/.vscode/extensions.json b/extensions/positron/.vscode/extensions.json → extensions/vscode/.vscode/extensions.json
diff --git a/extensions/positron/.vscode/launch.json → extensions/vscode/.vscode/launch.json b/extensions/positron/.vscode/launch.json → extensions/vscode/.vscode/launch.json
diff --git a/extensions/positron/.vscode/settings.json → extensions/vscode/.vscode/settings.json b/extensions/positron/.vscode/settings.json → extensions/vscode/.vscode/settings.json
diff --git a/extensions/positron/.vscode/tasks.json → extensions/vscode/.vscode/tasks.json b/extensions/positron/.vscode/tasks.json → extensions/vscode/.vscode/tasks.json
diff --git a/extensions/positron/.vscodeignore → extensions/vscode/.vscodeignore b/extensions/positron/.vscodeignore → extensions/vscode/.vscodeignore
diff --git a/extensions/positron/CHANGELOG.md → extensions/vscode/CHANGELOG.md b/extensions/positron/CHANGELOG.md → extensions/vscode/CHANGELOG.md
diff --git a/extensions/positron/README.md → extensions/vscode/README.md b/extensions/positron/README.md → extensions/vscode/README.md
diff --git a/extensions/positron/justfile → extensions/vscode/justfile b/extensions/positron/justfile → extensions/vscode/justfile
@@ -27,7 +27,10 @@ clean:
     set -eou pipefail
     {{ _with_debug }}
 
+    rm -f *.vsix
+    rm -rf .vscode-test
     rm -rf node_modules
+    rm -rf out
 
 
 # Install dependencies
@@ -46,6 +49,15 @@ lint:
 
     npm run lint
 
+# Packages the extension
+package name version outpath="$(pwd)":
+    #!/usr/bin/env bash
+    set -eou pipefail
+    {{ _with_debug }}
+
+    npx @vscode/vsce package --skip-license -o {{ outpath }}/{{ name }}-{{ version }}.vsix
+
+
 # Executes commands via `npm`. Equivalent to `npm run`. Provides arbitrary command chaining inside of Docker from project root (i.e., `just positron run test`)
 run *args:
     #!/usr/bin/env bash

diff --git a/extensions/positron/package-lock.json → extensions/vscode/package-lock.json b/extensions/positron/package-lock.json → extensions/vscode/package-lock.json
diff --git a/extensions/positron/package.json → extensions/vscode/package.json b/extensions/positron/package.json → extensions/vscode/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "positron-publisher",
+  "name": "publisher",
   "displayName": "Positron Publisher",
   "description": "Publish your applications from Positron to Posit products",
-  "version": "0.0.1",
+  "version": "0.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/rstudio/publishing-client/tree/main/extensions/positron"

diff --git a/extensions/positron/settings.png → extensions/vscode/settings.png b/extensions/positron/settings.png → extensions/vscode/settings.png
diff --git a/extensions/positron/src/assistants.ts → extensions/vscode/src/assistants.ts b/extensions/positron/src/assistants.ts → extensions/vscode/src/assistants.ts
diff --git a/extensions/positron/src/commands.ts → extensions/vscode/src/commands.ts b/extensions/positron/src/commands.ts → extensions/vscode/src/commands.ts
diff --git a/extensions/positron/src/extension.ts → extensions/vscode/src/extension.ts b/extensions/positron/src/extension.ts → extensions/vscode/src/extension.ts
diff --git a/extensions/positron/src/ports.ts → extensions/vscode/src/ports.ts b/extensions/positron/src/ports.ts → extensions/vscode/src/ports.ts
diff --git a/extensions/positron/src/test/runTest.ts → extensions/vscode/src/test/runTest.ts b/extensions/positron/src/test/runTest.ts → extensions/vscode/src/test/runTest.ts
diff --git a/...positron/src/test/suite/extension.test.ts → ...s/vscode/src/test/suite/extension.test.ts b/...positron/src/test/suite/extension.test.ts → ...s/vscode/src/test/suite/extension.test.ts
diff --git a/extensions/positron/src/test/suite/index.ts → extensions/vscode/src/test/suite/index.ts b/extensions/positron/src/test/suite/index.ts → extensions/vscode/src/test/suite/index.ts
diff --git a/extensions/positron/tsconfig.json → extensions/vscode/tsconfig.json b/extensions/positron/tsconfig.json → extensions/vscode/tsconfig.json
diff --git a/...ions/positron/vsc-extension-quickstart.md → ...nsions/vscode/vsc-extension-quickstart.md b/...ions/positron/vsc-extension-quickstart.md → ...nsions/vscode/vsc-extension-quickstart.md
diff --git a/justfile b/justfile
@@ -191,20 +191,20 @@ lint: stub
     just _with_docker go vet -all ./...
     just _with_docker ./scripts/fmt-check.bash
 
-# Prints the pre-release status based on the version (see `just version`).
-pre-release:
+name:
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}
 
-    ./scripts/is-pre-release.bash
+    basename {{ _cmd }}
 
-positron *args:
+# Prints the pre-release status based on the version (see `just version`).
+pre-release:
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}
 
-    just _with_docker just extensions/positron/{{ args }}
+    ./scripts/is-pre-release.bash
 
 # Runs the CLI via `go run`.
 run *args:
@@ -261,6 +261,14 @@ version:
 
     ./scripts/get-version.bash
 
+# Executes commands in ./extensions/vscode/Justfile. Equivalent to `just extensions/vscode`, but inside of Docker (i.e., just _with_docker extension/vscode)
+vscode *args:
+    #!/usr/bin/env bash
+    set -eou pipefail
+    {{ _with_debug }}
+
+    just _with_docker just extensions/vscode/{{ args }}
+
 [private]
 _with_docker *args:
     #!/usr/bin/env bash