Merge branch 'main' into bq/one-click-workspace

matifali · web-flow · commit 6fcfa130344c · 2023-07-25T22:35:55.000+03:00
diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
@@ -39,18 +39,15 @@ jobs:
         id: pr_number
         run: |
           set -euxo pipefail
-          if [[ ${{ github.event_name }} == "workflow_dispatch" ]]; then
-            PR_NUMBER=${{ github.event.inputs.pr_number }}
-            PR_TITLE=$(gh pr view $PR_NUMBER --json title | jq -r '.title')
-          else
-            PR_NUMBER=${{ github.event.issue.number }}
-            PR_TITLE='${{ github.event.issue.title }}'
-          fi
+          PR_NUMBER=$(gh pr view ${{ github.event.inputs.pr_number }} --json number | jq -r '.number')
+          PR_TITLE=$(gh pr view $PR_NUMBER --json title | jq -r '.title')
           PR_BRANCH=$(gh pr view $PR_NUMBER --json headRefName | jq -r '.headRefName')
           echo "PR_URL=https://github.com/coder/coder/pull/$PR_NUMBER" >> $GITHUB_OUTPUT
           echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT
           echo "PR_TITLE=$PR_TITLE" >> $GITHUB_OUTPUT
           echo "PR_BRANCH=$PR_BRANCH" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set required tags
         id: set_tags
diff --git a/docs/platforms/jfrog.md b/docs/platforms/jfrog.md
@@ -131,6 +131,22 @@ Access token:                   ...
 Default:                        true
 ```
 
+## Installing the JFrog VS Code Extension
+
+You can install the JFrog VS Code extension into workspaces automatically
+by inserting the following lines into your `startup_script`:
+
+```sh
+  # Install the JFrog VS Code extension.
+  # Find the latest version number at
+  # https://open-vsx.org/extension/JFrog/jfrog-vscode-extension.
+  JFROG_EXT_VERSION=2.4.1
+  curl -o /tmp/jfrog.vsix -L "https://open-vsx.org/api/JFrog/jfrog-vscode-extension/$JFROG_EXT_VERSION/file/JFrog.jfrog-vscode-extension-$JFROG_EXT_VERSION.vsix"
+  /tmp/code-server/bin/code-server --install-extension /tmp/jfrog.vsix
+```
+
+Note that this will method will only work if your developers use code-server.
+
 ## Configuring npm
 
 Add the following line to your `startup_script` to configure `npm` to use
