Merge branch 'main' into source-root-input

.github/workflows/pr-checks.yml

@@ -120,8 +120,6 @@ jobs:
       with:
         config-file: ".github/codeql/codeql-config-packaging.yml"
         languages: javascript
-        # TODO: this can be removed when cli v2.5.6 is released and available in the tool cache
-        tools: https://github.com/dsp-testing/aeisenberg-codeql-action-packaging/releases/download/codeql-bundle-20210615/codeql-bundle-linux64.tar.gz
     - name: Build code
       shell: bash
       run: ./build.sh
@@ -164,8 +162,6 @@ jobs:
         config-file: ".github/codeql/codeql-config-packaging2.yml"
         languages: javascript
         packs: dsp-testing/codeql-pack1@0.0.4, dsp-testing/codeql-pack2
-        # TODO: this can be removed when cli v2.5.6 is released and available in the tool cache
-        tools: https://github.com/dsp-testing/aeisenberg-codeql-action-packaging/releases/download/codeql-bundle-20210615/codeql-bundle-linux64.tar.gz
 
     - name: Build code
       shell: bash
@@ -209,8 +205,6 @@ jobs:
         config-file: ".github/codeql/codeql-config-packaging3.yml"
         packs: +dsp-testing/codeql-pack1@0.0.4
         languages: javascript
-        # TODO: this can be removed when cli v2.5.6 is released and available in the tool cache
-        tools: https://github.com/dsp-testing/aeisenberg-codeql-action-packaging/releases/download/codeql-bundle-20210615/codeql-bundle-linux64.tar.gz
 
     - name: Build code
       shell: bash
@@ -234,7 +228,7 @@ jobs:
           exit 1
         fi
 
-  # Tests a split workflow where database construction and query execution happen in different steps 
+  # Tests a split workflow where database construction and query execution happen in different steps
   test-split-workflow:
     needs: [check-js, check-node-modules]
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - The `init` step of the Action now supports a `source-root` input to be able to specify a path under the GitHub workspace to be the root source-code directory. [#607](https://github.com/github/codeql-action/pull/607)
 - The `analyze` step of the Action now supports a `skip-queries` option to merely build the CodeQL database without analyzing. This functionality is not present in the runner. Additionally, the step will no longer fail if it encounters a finalized database, and will instead continue with query execution. [#602](https://github.com/github/codeql-action/pull/602)
+- Update the warning message when the baseline lines of code count is unavailable. [#608](https://github.com/github/codeql-action/pull/608)
 
 ## 1.0.4 - 28 Jun 2021
 

src/count-loc.ts

@@ -98,14 +98,13 @@ export async function countLoc(
     }
   } else {
     logger.info(
-      "Could not determine the total number of lines of code in this repository. " +
-        "Because of this, it will not be possible to compare the number of lines " +
-        "of code analyzed by code scanning with the total number of lines of " +
-        "code in the repository. This will not affect the results produced by code " +
-        "scanning. If you have any questions, you can raise an issue at " +
-        "https://github.com/github/codeql-action/issues. Please include a link " +
-        "to the repository if public, or otherwise information about the code scanning " +
-        "workflow you are using."
+      "Could not determine the baseline lines of code count in this repository. " +
+        "Because of this, it will not be possible to compare the lines " +
+        "of code analyzed by code scanning with the baseline. This will not affect " +
+        "the results produced by code scanning. If you have any questions, you can " +
+        "raise an issue at https://github.com/github/codeql-action/issues. Please " +
+        "include a link to the repository if public, or otherwise information about " +
+        "the code scanning workflow you are using."
     );
   }