From eac8a06b3c3d110d4d0dec39ff2c840106a6369a Mon Sep 17 00:00:00 2001
From: Kelvin Schoofs <schoofs.kelvin@gmail.com>
Date: Sat, 25 Mar 2023 20:30:57 +0100
Subject: [PATCH] Update workflows to use ubuntu-22.04 and updated dependencies
 (#372)

---
 .github/workflows/build-extension.yml   | 50 ++++++++-----------------
 .github/workflows/publish-extension.yml |  6 +--
 CHANGELOG.md                            |  6 +++
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml
index b37680e..2f19f7d 100644
--- a/.github/workflows/build-extension.yml
+++ b/.github/workflows/build-extension.yml
@@ -6,71 +6,51 @@ on:
     tags: ['**']
     branches:
       - '*'
+      - 'issue/**'
       - 'feature/**'
       - 'release/**'
   pull_request:
     types: [opened, synchronize]
     branches:
       - '*'
+      - 'issue/**'
       - 'feature/**'
       - 'release/**'
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     name: Build and package
     timeout-minutes: 10 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Event Utilities
-      uses: SchoofsKelvin/event-utilities@v1
+      uses: SchoofsKelvin/event-utilities@v1.1.0
       id: utils
       with:
         artifact_prefix: "vscode-sshfs"
         artifact_extension: "vsix"
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@v1
+    - name: Use Node.js 18
+      uses: actions/setup-node@v3
       with:
-        node-version: 14.x
-    - name: Get Yarn cache directory
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-    - name: Yarn cache
-      uses: actions/cache@v2.1.4
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
+        node-version: 18
+        cache: yarn
+        cache-dependency-path: .yarn/yarn.lock
     - name: Install dependencies
       run: yarn --immutable
     - name: Build extension
       run: yarn vsce package -o ${{ steps.utils.outputs.artifact_name }} --yarn --no-dependencies
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v2.2.1
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ steps.utils.outputs.artifact_name }}
         path: ${{ steps.utils.outputs.artifact_name }}
         if-no-files-found: error
-    - name: Create release
-      id: create_release
+    - name: Create release with artifact
       if: ${{ success() && steps.utils.outputs.tag_version }}
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: softprops/action-gh-release@v1
       with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ steps.utils.outputs.tag_version }}
+        name: Release ${{ steps.utils.outputs.tag_version }}
         draft: true
-    - name: Upload release asset
-      id: upload_release_asset
-      if: ${{ success() && steps.utils.outputs.tag_version }}
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{ steps.utils.outputs.artifact_name }}
-        asset_name: ${{ steps.utils.outputs.artifact_name }}
-        asset_content_type: application/vsix
+        files: ${{ steps.utils.outputs.artifact_name }}
diff --git a/.github/workflows/publish-extension.yml b/.github/workflows/publish-extension.yml
index 1aff0aa..8aebc47 100644
--- a/.github/workflows/publish-extension.yml
+++ b/.github/workflows/publish-extension.yml
@@ -15,11 +15,10 @@ jobs:
     - name: Validate extension file
       run: unzip -f extension.vsix extension/package.json
     - name: Publish to Open VSX Registry
-      uses: HaaLeo/publish-vscode-extension@v0
+      uses: HaaLeo/publish-vscode-extension@v1
       with:
         pat: ${{ secrets.OPEN_VSX_TOKEN }}
         extensionFile: extension.vsix
-        packagePath: ''
   vs:
     name: "Visual Studio Marketplace"
     if: endsWith(github.event.release.assets[0].name, '.vsix')
@@ -30,9 +29,8 @@ jobs:
     - name: Validate extension file
       run: unzip -f extension.vsix extension/package.json
     - name: Publish to Visual Studio Marketplace
-      uses: HaaLeo/publish-vscode-extension@v0
+      uses: HaaLeo/publish-vscode-extension@v1
       with:
         pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
         registryUrl: https://marketplace.visualstudio.com
         extensionFile: extension.vsix
-        packagePath: ''
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf7f87c..3414d18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,12 @@
   - Upgrade a bunch of plugins and other dependencies
 - Fix linter warnings in Markdown files and remove default webview/README.md
 - Fix build workflow to account for incompatibility from using a new `vsce` version
+- Updated the GitHub workflows (#372)
+  - Added `issue/**` to the `push` and `pull_request` triggers to automatically build on these branches
+  - The build workflow upgraded from `ubuntu-18.04` to `ubuntu-22.04`
+  - All actions are upgraded to a more recent version
+  - Caching of Yarn dependencies is now handled by `actions/setup-node`
+  - Migrated from `actions/create-release` and `actions/upload-release-asset` to `softprops/action-gh-release`
 
 ## v1.25.0 (2022-06-01)