Make the 'build vsix' composite action reference other actions (microsoft#17257)

Author: brettcannon

.github/actions/build-vsix/action.yml

@@ -1,14 +1,31 @@
 name: 'Build VSIX'
 description: "Build the extension's VSIX"
 
-outputs:
-  path:
-    description: 'Path to the VSIX'
-    value: 'ms-python-insiders.vsix'
+inputs:
+  node_version:
+    description: 'Version of Node to install'
+    required: true
+  vsix_name:
+    description: 'Name to give the final VSIX'
+    required: true
+  artifact_name:
+    description: 'Name to give the artifact containing the VSIX'
+    required: true
 
 runs:
   using: 'composite'
   steps:
+    - name: Install Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ inputs.node_version }}
+
+    # Jedi LS depends on dataclasses which is not in the stdlib in Python 3.6.
+    - name: Use Python 3.6 for JediLSP
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+
     - name: Upgrade Pip
       run: python -m pip install -U pip
       shell: bash
@@ -51,3 +68,16 @@ runs:
     - name: Build VSIX
       run: npm run package
       shell: bash
+
+    - name: Rename VSIX
+      # Move to a temp name in case the specified name happens to match the default name.
+      run: mv ms-python-insiders.vsix ms-python-temp.vsix && mv ms-python-temp.vsix ${{ inputs.vsix_name }}
+      shell: bash
+
+    - name: Upload VSIX
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ inputs.artifact_name }}
+        path: ${{ inputs.vsix_name }}
+        if-no-files-found: error
+        retention-days: 7

.github/workflows/build.yml

@@ -42,39 +42,20 @@ jobs:
           print(f"::set-output name=vsix_artifact_name::ms-python-{vsix_type}-vsix")
 
   build-vsix:
-    name: Build VSIX
+    name: Create VSIX
     if: github.repository == 'microsoft/vscode-python'
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
-
-      - name: Install Node
-        uses: actions/setup-node@v2.4.0
-        with:
-          node-version: ${{env.NODE_VERSION}}
-
-      # Jedi LS depends on dataclasses which was a pypi install in 3.6
-      - name: Use Python 3.6 for JediLSP
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.6
+        uses: actions/checkout@v2
 
       - name: Build VSIX
         uses: ./.github/actions/build-vsix
-        id: build-vsix
-
-      - name: Rename VSIX
-        if: steps.build-vsix.outputs.path != needs.setup.outputs.vsix_name
-        run: mv ${{ steps.build-vsix.outputs.path }} ${{ needs.setup.outputs.vsix_name }}
-
-      - uses: actions/upload-artifact@v2
         with:
-          name: ${{ needs.setup.outputs.vsix_artifact_name }}
-          path: ${{ needs.setup.outputs.vsix_name }}
-          if-no-files-found: error
-          retention-days: 14
+          node_version: ${{ env.NODE_VERSION }}
+          vsix_name: ${{ needs.setup.outputs.vsix_name }}
+          artifact_name: ${{ needs.setup.outputs.vsix_artifact_name }}
 
   lint:
     name: Lint

.github/workflows/pr-check.yml

@@ -21,36 +21,18 @@ env:
 
 jobs:
   build-vsix:
-    name: Build VSIX
+    name: Create VSIX
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
-
-      - name: Install Node
-        uses: actions/setup-node@v2.4.0
-        with:
-          node-version: ${{env.NODE_VERSION}}
-
-      # Jedi LS depends on dataclasses which was a pypi install in 3.6
-      - name: Use Python 3.6 for JediLSP
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.6
+        uses: actions/checkout@v2
 
       - name: Build VSIX
         uses: ./.github/actions/build-vsix
-        id: build-vsix
-
-      - name: Rename VSIX
-        if: steps.build-vsix.outputs.path != env.VSIX_NAME
-        run: mv ${{ steps.build-vsix.outputs.path }} ${{ env.VSIX_NAME }}
-
-      - uses: actions/upload-artifact@v2
         with:
-          name: ${{env.ARTIFACT_NAME_VSIX}}
-          path: ${{env.VSIX_NAME}}
-          retention-days: 7
+          node_version: ${{ env.NODE_VERSION}}
+          vsix_name: ${{ env.VSIX_NAME }}
+          artifact_name: ${{ env.ARTIFACT_NAME_VSIX }}
 
   lint:
     name: Lint