Merge branch 'master' into auto-update-vscode

viperproject · Jan 25, 2024 · 08ca569 · 08ca569
2 parents f724f0b + 55526b3
commit 08ca569
Show file tree

Hide file tree

Showing 9 changed files with 1,022 additions and 751 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,3 +5,18 @@ updates:
     directory: "/client"
     schedule:
       interval: monthly
+      day: monday
+    ignore:
+      - dependency-name: "@types/vscode"
+    groups:
+      all:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: monthly
+    groups:
+      all:
+        patterns:
+          - "*"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -84,7 +84,7 @@ jobs:
           mkdir ViperToolsMacARM
 
       - name: Clone ViperTools template
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: viperproject/viper-ide-deps
           ref: ${{ env.VIPER_IDE_DEPS_REF }}
@@ -161,7 +161,7 @@ jobs:
         working-directory: ViperToolsMacARM
 
       - name: Upload ViperTools zip files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ViperTools
           path: deploy
@@ -187,22 +187,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Viper-IDE
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16' # we use latest node instead of LTS 14 to have the same lockfile version as locally used
+          node-version: '18' # Should match the version in client/src/test/data/vscode-version
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'
       - run: java --version
 
       - name: Cache npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: client/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -226,7 +226,7 @@ jobs:
       #   nightly ViperTool releases AND the ViperTools that should be released.
       - name: Download ViperTools to test against (only downloading previously created ViperTools)
         if: ${{ contains(needs.create-viper-tools.result, 'success') }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ViperTools
           path: client/ViperTools
@@ -310,7 +310,7 @@ jobs:
 
       - name: Upload Viper-IDE log files
         if: ${{ failure() || cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: TestLogs-${{ matrix.os }}
           path: client/logs
@@ -352,7 +352,7 @@ jobs:
 
       - name: Upload packaged Viper-IDE (ubuntu-only)
         if: startsWith(matrix.os, 'ubuntu')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: viper-ide.vsix
           path: client/viper-ide.vsix
@@ -370,16 +370,16 @@ jobs:
     steps:
       # we have to checkout the repo to read client/package.json later on:
       - name: Checkout Viper-IDE
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download packaged Viper IDE
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: viper-ide.vsix
           path: client
 
       - name: Download ViperTools
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ViperTools
           path: deploy

diff --git a/.github/workflows/update-vscode.yml b/.github/workflows/update-vscode.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Update VS Code version used by the tests
         run: |
@@ -32,7 +32,7 @@ jobs:
           echo "TEST_VSCODE_VERSION=$TEST_VSCODE_VERSION" >> $GITHUB_ENV
           echo "LATEST_VSCODE_VERSION=$LATEST_VSCODE_VERSION" >> $GITHUB_ENV
       - name: Open a pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         if: env.TEST_VSCODE_VERSION != env.LATEST_VSCODE_VERSION
         with:
           # Use viper-admin's token to workaround a restriction of GitHub.