Merge branch 'main' into dependabot/npm_and_yarn/dependencies-037e70d3ae

ansible · Oct 9, 2024 · 4031f2c · 4031f2c
2 parents dce05f3 + 67d591e
commit 4031f2c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -29,6 +29,8 @@ updates:
       # @types/vscode should be manually bumped when we also update
       # engines.vscode inside package.json
       - dependency-name: "@types/vscode"
+      - dependency-name: "codecov/codecov-action"
+        versions: ["4.6.0"]
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -350,7 +350,7 @@ jobs:
           path: .
 
       - name: Upload als test coverage data [1/4]
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.5.0
         with:
           name: als
           files: ./*/coverage/als/lcov.info
@@ -360,7 +360,7 @@ jobs:
           use_oidc: true # cspell:ignore oidc
 
       - name: Upload unit test coverage data [2/4]
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.5.0
         with:
           name: unit
           files: ./*/coverage/unit/lcov.info
@@ -370,7 +370,7 @@ jobs:
           use_oidc: true # cspell:ignore oidc
 
       - name: Upload ui test coverage data [3/4]
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.5.0
         with:
           name: unit
           files: ./*/coverage/ui/lcov.info
@@ -380,7 +380,7 @@ jobs:
           use_oidc: true # cspell:ignore oidc
 
       - name: Upload e2e test coverage data [4/4]
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.5.0
         with:
           name: e2e
           files: ./*/coverage/e2e/lcov.info

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -98,7 +98,7 @@ repos:
       #   entry: npx yarn npm audit
 
   - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: end-of-file-fixer
         exclude: >
@@ -158,7 +158,7 @@ repos:
             docs/als/settings.md
           )$
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.42.0
     hooks:
       - id: markdownlint
         exclude: >
@@ -174,7 +174,7 @@ repos:
             docs/development/webview_guide.md
           $
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.17.0
+    rev: v9.18.0
     hooks:
       - id: commitlint
         stages: [commit-msg]
diff --git a/packages/ansible-language-server/test/helper.ts b/packages/ansible-language-server/test/helper.ts
@@ -39,15 +39,15 @@ export function deleteAlsCache(): void {
 
 export function setFixtureAnsibleCollectionPathEnv(prePendPath?: string): void {
   if (prePendPath) {
-    process.env.ANSIBLE_COLLECTIONS_PATHS = `${prePendPath}:${ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH}`;
+    process.env.ANSIBLE_COLLECTIONS_PATH = `${prePendPath}:${ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH}`;
   } else {
-    process.env.ANSIBLE_COLLECTIONS_PATHS =
+    process.env.ANSIBLE_COLLECTIONS_PATH =
       ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH;
   }
 }
 
 export function unSetFixtureAnsibleCollectionPathEnv(): void {
-  process.env.ANSIBLE_COLLECTIONS_PATHS = undefined;
+  process.env.ANSIBLE_COLLECTIONS_PATH = undefined;
 }
 
 export function setAnsibleConfigEnv(): void {

diff --git a/test/helper.ts b/test/helper.ts
@@ -104,15 +104,15 @@ export function setFixtureAnsibleCollectionPathEnv(
   prePendPath: string | undefined = undefined,
 ): void {
   if (prePendPath) {
-    process.env.ANSIBLE_COLLECTIONS_PATHS = `${prePendPath}:${ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH}`;
+    process.env.ANSIBLE_COLLECTIONS_PATH = `${prePendPath}:${ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH}`;
   } else {
-    process.env.ANSIBLE_COLLECTIONS_PATHS =
+    process.env.ANSIBLE_COLLECTIONS_PATH =
       ANSIBLE_COLLECTIONS_FIXTURES_BASE_PATH;
   }
 }
 
 export function unSetFixtureAnsibleCollectionPathEnv(): void {
-  process.env.ANSIBLE_COLLECTIONS_PATHS = undefined;
+  process.env.ANSIBLE_COLLECTIONS_PATH = undefined;
 }
 
 export async function enableExecutionEnvironmentSettings(): Promise<void> {

diff --git a/test/testScripts/diagnostics/testYamlWithoutEE.test.ts b/test/testScripts/diagnostics/testYamlWithoutEE.test.ts
@@ -93,7 +93,7 @@ export function testDiagnosticsYAMLWithoutEE(): void {
             severity: 0,
             message:
               "Syntax Error while loading YAML.\n" +
-              "  mapping values are not allowed in this context\n",
+              "  mapping values are not allowed in this context",
             range: new vscode.Range(
               new vscode.Position(6, 21),
               new vscode.Position(6, integer.MAX_VALUE),