Update integrated AGLint to v2.0.9

Merge in ADGUARD-FILTERS/vscode-adblock-syntax from update-aglint-to-v2.0.9 to master Squashed commit of the following: commit 94481a7 Author: scripthunter7 <[email protected]> Date: Fri Apr 26 11:04:49 2024 +0200 changelog commit 62f66e1 Author: scripthunter7 <[email protected]> Date: Fri Apr 26 11:02:25 2024 +0200 update, format bamboo specs commit 1864990 Author: scripthunter7 <[email protected]> Date: Fri Apr 26 11:02:08 2024 +0200 update gh workflows commit ada5a35 Author: scripthunter7 <[email protected]> Date: Fri Apr 26 11:01:45 2024 +0200 update integrated aglint
AdguardTeam · Apr 26, 2024 · 2577c69 · 2577c69
1 parent 16e8508
commit 2577c69
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 63 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -1,7 +1,7 @@
 name: Check code
 
 env:
-  NODE_VERSION: 18
+  NODE_VERSION: 20
 
 on:
   push:
@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out to repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -41,12 +41,15 @@ jobs:
         run: yarn test
 
   notify:
-    name: Send Slack notification
-    needs:
-      - check_code
-
+    name: Send Slack notification on failure
+    needs: check_code
+    # Run this job only if the previous job failed and the event was triggered by the 'AdguardTeam/VscodeAdblockSyntax' repository
+    # Note: 'always()' is needed to run the notify job even if the test job was failed
     if:
-      ${{ always() &&
+      ${{
+        always() &&
+        needs.check_code.result == 'failure' &&
+        github.repository == 'AdguardTeam/VscodeAdblockSyntax' &&
         (
           github.event_name == 'push' ||
           github.event_name == 'workflow_dispatch' ||
@@ -55,14 +58,12 @@ jobs:
       }}
     runs-on: ubuntu-latest
     steps:
-      - name: Conclusion
-        uses: technote-space/workflow-conclusion-action@v3
-
       - name: Send Slack notification
         uses: 8398a7/action-slack@v3
         with:
-          status: ${{ env.WORKFLOW_CONCLUSION }}
-          fields: workflow, repo, message, commit, author, eventName, ref
+          status: failure
+          fields: workflow, repo, message, commit, author, eventName, ref, job
+          job_name: check_code
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,7 +1,7 @@
 name: Create GitHub Release
 
 env:
-  NODE_VERSION: 18
+  NODE_VERSION: 20
 
 on:
   push:
@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: https://registry.npmjs.org
@@ -50,7 +50,7 @@ jobs:
           yarn extract-changelog -e $VERSION
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             syntaxes/out/adblock.plist
@@ -63,26 +63,22 @@ jobs:
 
   notify:
     name: Send Slack notification
-    needs:
-      - release
-
+    needs: release
+    # Note: 'always()' is needed to run the notify job even if the test job was failed
     if:
-      ${{ always() &&
-        (
-          github.event_name == 'push' ||
-          github.event_name == 'workflow_dispatch'
-        )
+      ${{
+        always() &&
+        github.repository == 'AdguardTeam/VscodeAdblockSyntax' &&
+        github.event_name == 'push'
       }}
     runs-on: ubuntu-latest
     steps:
-      - name: Conclusion
-        uses: technote-space/workflow-conclusion-action@v3
-
       - name: Send Slack notification
         uses: 8398a7/action-slack@v3
         with:
-          status: ${{ env.WORKFLOW_CONCLUSION }}
-          fields: workflow, repo, message, commit, author, eventName, ref
+          status: ${{ needs.release.result }}
+          fields: workflow, repo, message, commit, author, eventName, ref, job
+          job_name: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
 
+## 1.1.9 - 2024-04-26
+
+### Changed
+
+- Updated integrated [AGLint] to v2.0.9
+
+
 ## 1.1.8 - 2024-04-03
 
 ### Fixed

diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml
@@ -1,14 +1,10 @@
 ---
 !include 'test.yaml'
-
 ---
 !include 'increment.yaml'
-
 ---
 !include 'build.yaml'
-
 ---
 !include 'deploy.yaml'
-
 ---
 !include 'permissions.yaml'
diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXBUILD
   name: vscode adblock syntax - build release
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Build:
@@ -21,7 +21,7 @@ Build:
   docker:
     image: ${bamboo.dockerNode}
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   tasks:
     - checkout:
         force-clean-build: true
@@ -95,7 +95,7 @@ Build:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             rm -rf node_modules
 
@@ -104,7 +104,7 @@ Build:
 
             # cleanup server directory
             rm -rf server/node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   # Store the .vsix file as a build artifact
   artifacts:

diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
@@ -10,9 +10,9 @@ environments:
 
 marketplace.visualstudio.com:
   docker:
-    image: adguard/node-ssh:18.13--1
+    image: adguard/node-ssh:21.7--1
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   triggers: []
   tasks:
     - checkout:
@@ -56,13 +56,13 @@ marketplace.visualstudio.com:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             # note: no need to clean client and server directories here, because we only installed
             #       dependencies in the root directory (for the vsce publish command above)
             # TODO: switch to yarn workspaces
             rm -rf node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: 'true'
@@ -78,7 +78,7 @@ open-vsx.org:
   docker:
     image: adguard/node-ssh:18.13--1
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   triggers: []
   tasks:
     - checkout:
@@ -122,13 +122,13 @@ open-vsx.org:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             # note: no need to clean client and server directories here, because we only installed
             #       dependencies in the root directory (for the vsce publish command above)
             # TODO: switch to yarn workspaces
             rm -rf node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: 'true'

diff --git a/bamboo-specs/increment.yaml b/bamboo-specs/increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXINCR
   name: vscode adblock syntax - increment
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Increment:
@@ -17,9 +17,9 @@ stages:
 Increment:
   key: INCR
   docker:
-    image: "${bamboo.dockerNode}"
+    image: '${bamboo.dockerNode}'
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   other:
     clean-working-dir: true
   tasks:

diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXTEST
   name: vscode adblock syntax - tests
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Build:
@@ -17,9 +17,9 @@ stages:
 Build:
   key: BUILD
   docker:
-    image: "${bamboo.dockerNode}"
+    image: '${bamboo.dockerNode}'
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   tasks:
     - checkout:
         force-clean-build: true
@@ -78,7 +78,7 @@ Build:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             rm -rf node_modules
 
@@ -87,7 +87,7 @@ Build:
 
             # cleanup server directory
             rm -rf server/node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: true

diff --git a/server/package.json b/server/package.json
@@ -12,7 +12,7 @@
         "vscode-languageserver-textdocument": "^1.0.8"
     },
     "devDependencies": {
-        "@adguard/aglint": "2.0.8",
+        "@adguard/aglint": "2.0.9",
         "@types/clone-deep": "^4.0.1",
         "@types/semver": "^7.5.0",
         "clone-deep": "^4.0.1",

diff --git a/server/yarn.lock b/server/yarn.lock
@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@adguard/[email protected].8":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@adguard/aglint/-/aglint-2.0.8.tgz#82661e1bef23025161dc74d7b3dd24218f2e04d4"
-  integrity sha512-aRioaWDWItE3hjgvfUFvuzynQhorOk6/1aFug12Zsv1fmSZbmsx8tfP+RK/Z/oRx5QoSuHD+5y8lPYd34+qddw==
+"@adguard/[email protected].9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@adguard/aglint/-/aglint-2.0.9.tgz#2082b12107dd2090102a72d64d8397a09f5e98d0"
+  integrity sha512-1xnQdGNwk6xb9m8YyxbaMLbSTQ59tehlwv7P92O7MqIMFLoLJy70HPrx3JOTj+GRrSNQOuJFHJnl7LVvF7pyUw==
   dependencies:
-    "@adguard/agtree" "^1.1.7"
+    "@adguard/agtree" "^1.1.8"
     "@inquirer/checkbox" "^1.3.7"
     "@inquirer/select" "^1.2.7"
     chalk "4.1.2"
@@ -24,10 +24,10 @@
     terminal-link "2.1.1"
     text-table "^0.2.0"
 
-"@adguard/agtree@^1.1.7":
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/@adguard/agtree/-/agtree-1.1.7.tgz#0bafee0396da704958ba6014ad83565e57c5b279"
-  integrity sha512-xol2aSim0BYnxCk/OULE3qXFToSnadNsl4q6DDjhHkXvKTr0Y6hnfq4Ub3BGgEpyzGYYkN37BDz8IEUDdpRyew==
+"@adguard/agtree@^1.1.8":
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/@adguard/agtree/-/agtree-1.1.8.tgz#e001389bdb08476eb3c55e56922179a14e9b5fbf"
+  integrity sha512-5k9bYA+JSfZgYTvwahkM8ihIf1fvP+RxA1dKLgkRIGa6ixOSWNKv/pN0Rpiy0DwZJbC9X/OeZrtdW66jASH/JA==
   dependencies:
     "@adguard/ecss-tree" "^1.0.8"
     "@adguard/scriptlets" "^1.9.61"