diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 75f39ba..136ea87 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -91,7 +91,7 @@ jobs: - name: Install test pack dependencies run: | cd src/test/ql/test - codeql pack install + codeql pack install --search-path ../../../../src/main/ql - name: Run CodeQL tests run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..a129eee --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,44 @@ +name: test +run-name: Test + +on: + pull_request: + push: + branches: + - master + +permissions: + contents: read + +jobs: + test: + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Fetch CodeQL + shell: bash + env: + GITHUB_TOKEN: ${{ github.token }} + run: | + gh extension install github/gh-codeql + gh codeql version + printf "CODEQL_FETCHED_CODEQL_PATH=" >> "${GITHUB_ENV}" + gh codeql version --format=json | jq -r .unpackedLocation >> "${GITHUB_ENV}" + gh codeql version --format=json | jq -r .unpackedLocation >> "${GITHUB_PATH}" + + - name: Install test pack dependencies + run: | + cd src/test/ql/test + codeql pack install --search-path ../../../../src/main/ql + + - name: Run CodeQL tests + run: | + codeql test run src/test/ql/test/query-tests --search-path src/main/ql diff --git a/.gitignore b/.gitignore index 072ae1c..2b8730a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +### Java ### +*.class + ### Gradle ### build/ diff --git a/src/test/ql/test/codeql-pack.lock.yml b/src/test/ql/test/codeql-pack.lock.yml index c212dac..f726a2c 100644 --- a/src/test/ql/test/codeql-pack.lock.yml +++ b/src/test/ql/test/codeql-pack.lock.yml @@ -2,7 +2,7 @@ lockVersion: 1.0.0 dependencies: carlspring/vertx-codeql-queries: - version: 1.0.0 + version: 1.0.1 codeql/java-all: version: 0.7.1 codeql/java-queries: diff --git a/src/test/ql/test/query-tests/InsecureCorsHttpOrigin/options b/src/test/ql/test/query-tests/InsecureCorsHttpOrigin/options index a16b40d..8a406bd 100644 --- a/src/test/ql/test/query-tests/InsecureCorsHttpOrigin/options +++ b/src/test/ql/test/query-tests/InsecureCorsHttpOrigin/options @@ -1 +1 @@ -//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 +//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 -target 17 diff --git a/src/test/ql/test/query-tests/InsecureCorsWildcardOrigin/options b/src/test/ql/test/query-tests/InsecureCorsWildcardOrigin/options index a16b40d..8a406bd 100644 --- a/src/test/ql/test/query-tests/InsecureCorsWildcardOrigin/options +++ b/src/test/ql/test/query-tests/InsecureCorsWildcardOrigin/options @@ -1 +1 @@ -//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 +//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 -target 17 diff --git a/src/test/ql/test/query-tests/InsecureHttpServer/options b/src/test/ql/test/query-tests/InsecureHttpServer/options index a16b40d..8a406bd 100644 --- a/src/test/ql/test/query-tests/InsecureHttpServer/options +++ b/src/test/ql/test/query-tests/InsecureHttpServer/options @@ -1 +1 @@ -//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 +//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/ -source 17 -target 17