Merge remote-tracking branch 'origin/main' into feature/lsp-formatting

Author: toinehartman

.github/ISSUE_TEMPLATE/stable-release-manual-testing-template.md

@@ -17,13 +17,9 @@ assignees: ''
 
 First a "pre-release" of the supporting compiler/typechecker tools must be done, so we know we are releasing a consistently compiled standard library.
 
-- [ ] typepal and rascal-core compile in the continuous integration environment and no tests fail
-- [ ] release typepal
-- [ ] release rascal-core
-- [ ] bump typepal and rascal-core versions in rascal-maven-plugin to latest releases
-- [ ] release rascal-maven-plugin
-- [ ] bump rascal-maven-plugin dependency in rascal and rascal-lsp projects
-- [ ] bump typepal and rascal-core versions in rascal-lsp project
+- [ ] rascal compiles in the continuous integration environment and no tests fail
+- [ ] release rascal
+- [ ] bump rascal version in rascal-lsp project
 - [ ] fix new errors and warnings in rascal and rascal-lsp project
 
 # Manual version checks

.github/dependabot.yml

@@ -25,3 +25,11 @@ updates:
         dependency-type: "development"
         exclude-patterns:
         - "@types/vscode"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      version-updates:
+        patterns:
+        - "*"

.github/workflows/build.yaml

@@ -16,19 +16,19 @@ permissions:
 
 jobs:
   normal-tests:
-    runs-on: buildjet-2vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-2
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Assure different pom cache hit
         run: echo "  " >> rascal-lsp/pom.xml
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
 
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20.x
           cache: 'npm'
@@ -37,7 +37,7 @@ jobs:
 
       - name: Run java tests
         working-directory: ./rascal-lsp
-        run: mvn -B '-Drascal.compile.skip' '-Drascal.tutor.skip' test -DargLine="-Xmx4G"
+        run: mvn -B '-Drascal.compile.skip' '-Drascal.tutor.skip' test -DargLine="-Xmx8G"
 
       - name: VS Code tests
         working-directory: ./rascal-vscode-extension
@@ -49,23 +49,23 @@ jobs:
   ui-test:
     strategy:
       matrix:
-        os: [buildjet-4vcpu-ubuntu-2204, windows-latest, macos-latest]
+        os: [ubicloud-standard-4, windows-latest, macos-latest]
       fail-fast: true
     env:
       CODE_VERSION: "1.90.2"
     runs-on:  ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Assure different pom cache hit
         run: echo " " >> rascal-lsp/pom.xml
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
 
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20.x
           cache: 'npm'
@@ -84,39 +84,44 @@ jobs:
 
       - name: Cache vscode downloads 
         id: cache-vscode
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ./rascal-vscode-extension/uitests
           key: "vscode-${{matrix.os}}"
 
       - name: "UI test (windows)"
-        if: matrix.os == 'windows-latest'
+        if: contains(matrix.os, 'windows')
         working-directory: ./rascal-vscode-extension
         env:
           DELAY_FACTOR: 10
+          RASCAL_LSP_DEV_DEPLOY: true
           _JAVA_OPTIONS: '-Xmx5G'
         run: npx extest setup-and-run out/test/vscode-suite/*.test.js --storage uitests
 
       - name: "UI test (mac)"
         shell: bash
-        if: matrix.os == 'macos-latest'
+        if: contains(matrix.os, 'macos')
         working-directory: ./rascal-vscode-extension
         env:
           DELAY_FACTOR: 15
+          RASCAL_LSP_DEV_DEPLOY: true
           _JAVA_OPTIONS: '-Xmx5G'
         run: npx extest setup-and-run out/test/vscode-suite/*.test.js --storage uitests
 
       - name: "UI test (ubuntu)"
         shell: bash
-        if: matrix.os == 'buildjet-4vcpu-ubuntu-2204'
+        if: contains(matrix.os, 'ubuntu') || startsWith(matrix.os, 'ubicloud-standard')
         working-directory: ./rascal-vscode-extension
         env:
           DELAY_FACTOR: 8
+          RASCAL_LSP_DEV_DEPLOY: true
           _JAVA_OPTIONS: '-Xmx5G' # we have 16gb of memory, make sure LSP, REPL & DSL-LSP can start
-        run: xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npx extest setup-and-run out/test/vscode-suite/*.test.js --storage uitests
+        run: |
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 # workaround for issue with Ubuntu 24.04 https://github.com/redhat-developer/vscode-extension-tester/blob/main/KNOWN_ISSUES.md#openresources-not-working-with-apparmor-2404
+          xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npx extest setup-and-run out/test/vscode-suite/*.test.js --storage uitests
 
       - name: Upload Screenshots
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: screenshots-${{ matrix.os }}
@@ -132,17 +137,22 @@ jobs:
 
   build:
     needs: [ui-test, normal-tests]
-    runs-on: buildjet-2vcpu-ubuntu-2204
+    environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'deployments' || '' }}
+    permissions:
+      id-token: write # only used for npm publishing
+      actions: read # we need to copy this sadly
+      contents: write
+    runs-on: ${{ startsWith(github.ref, 'refs/tags/v') && 'ubuntu-latest' || 'ubicloud-standard-2' }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
 
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20.x
           cache: 'npm'
@@ -178,14 +188,15 @@ jobs:
           npx vsce package
 
       - name: upload final vsix 
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           path: rascal-vscode-extension/*.vsix
           retention-days: 20
+          archive: false
 
       - name: Publish release to Open VSX Registry
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: HaaLeo/publish-vscode-extension@v1
+        uses: HaaLeo/publish-vscode-extension@v2
         continue-on-error: true
         id: publishToOpenVSX
         with:
@@ -195,15 +206,15 @@ jobs:
 
       - name: Publish release to Visual Studio Marketplace
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: HaaLeo/publish-vscode-extension@v1
+        uses: HaaLeo/publish-vscode-extension@v2
         with:
           packagePath: ./rascal-vscode-extension
           pat: ${{ secrets.AZURE_USETHESOURCE_PAT }}
           registryUrl: https://marketplace.visualstudio.com
           extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }} # copy exact same vsix from the previous step
 
       - name: Prepare Draft Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         continue-on-error: true
         if: startsWith(github.ref, 'refs/tags/v')
         with:
@@ -229,6 +240,6 @@ jobs:
       - name: publish to NPM
         if: startsWith(github.ref, 'refs/tags/v')
         working-directory: rascal-vscode-extension
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: npm publish --access=public
+        run: |
+          npm install -g npm@11.x # we need to use a newer version of npm due to oidc support
+          npm publish --provenance --access=public

.github/workflows/lint.yaml

@@ -13,6 +13,8 @@ on:
     branches:
       - '**'
 
+env:
+  MAVEN_OPTS: '-Xmx4G -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true  -Drascal.compile.skip -Drascal.tutor.skip -Drascal.package.skip'
 
 permissions:
   checks: write
@@ -25,35 +27,36 @@ jobs:
     name: SonarCloud 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # sonar needs full checkout for better blame information
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Build and analyze java
+      - name: Build, test and analyze java (also collect coverage data)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -f ./rascal-lsp/pom.xml -Pcoverage -B -Drascal.compile.skip -Drascal.tutor.skip verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=usethesource_rascal-language-servers
+        working-directory: ./rascal-lsp
+        run: mvn -B -Pcoverage verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=usethesource_rascal-language-servers 
 
   eslint:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: rascal-vscode-extension/package-lock.json
           registry-url: 'https://registry.npmjs.org'
@@ -69,22 +72,23 @@ jobs:
           eslint_dir: ./rascal-vscode-extension
           eslint_args: "src"
           eslint_extensions: ts
+          continue_on_error: false
 
   checkstyle:
     name: checkstyle 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with: 
           ref: ${{ github.event.pull_request.head.sha }} # run it on the PR, not on the merged commit, for better line numbers
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Run checkstyle and print errors
-        run: mvn -B checkstyle:checkstyle  checkstyle:check
+        run: mvn -B checkstyle:checkstyle checkstyle:check
         working-directory: ./rascal-lsp
       - name: Report build results
         uses: gmazzo/publish-report-annotations@v1 # target latest major
@@ -120,27 +124,46 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - if: ${{ matrix.language == 'java' }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
           cache: 'maven'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
 
       - if: ${{ matrix.language == 'java' }}
         name: Build java 
-        run: mvn -B compile -Drascal.compile.skip -Drascal.tutor.skip -DskipTests
+        run: mvn -B compile
         working-directory: rascal-lsp/
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:${{matrix.language}}"   
+
+
+  checker-framework:
+    name: checker-framework 
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Assure different pom cache hit
+        run: echo "    " >> rascal-lsp/pom.xml
+        
+      - uses: actions/setup-java@v5
         with:
-          category: "/language:${{matrix.language}}"   
+          java-version: 11
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Run checkstyle and print errors
+        run: mvn -Pchecker-framework clean compile
+        working-directory: ./rascal-lsp

.github/workflows/rascal-lsp-release.yaml

@@ -8,13 +8,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: deployments
     defaults:
       run:
         working-directory: ./rascal-lsp
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: 'temurin'
@@ -34,12 +35,3 @@ jobs:
           ssh-username: ${{ secrets.RELEASE_SSH_USERNAME }}
           ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
           working-directory: ./rascal-lsp
-
-      - name: Report Failure
-        if: failure()
-        uses: act10ns/slack@v2
-        with:
-          status: ${{ job.status }}
-          steps: ${{ toJson(steps) }}
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.RASCAL_SLACK_WEBHOOK }}

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 rascal-vscode-extension/dist/rascal-lsp-*.jar
-rascal-vscode-extension/rascalmpl-0.0.1.vsix
+rascal-vscode-extension/*.vsix
 rascal-vscode-extension/.vscode-test/
-rascal-lsp/bin
+rascal-lsp/bin
+*.log

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "files.exclude": {
+    "rascal-lsp": true,
+    "rascal-vscode-extension": true
+  }
+}

CODEOWNERS

@@ -0,0 +1 @@
+/.github/   @DavyLandman