From e85546cccaefbbc10aed3bcadcda3ea44449a712 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 31 Mar 2023 18:23:17 +0100 Subject: [PATCH] Move internal Actions into `.github/actions` This is a more standard location for these custom Actions. --- .../check-codescanning-config/action.yml | 0 .../check-codescanning-config/index.ts | 0 .github/{ => actions}/check-sarif/action.yml | 0 .github/{ => actions}/check-sarif/index.js | 0 .github/{ => actions}/prepare-test/action.yml | 0 .../query-filter-test/action.yml | 2 +- .github/{ => actions}/setup-swift/action.yml | 0 .github/actions/update-bundle/action.yml | 0 .github/dependabot.yml | 2 +- .github/workflows/__analyze-ref-input.yml | 2 +- .github/workflows/__autobuild-action.yml | 2 +- .github/workflows/__config-export.yml | 2 +- .github/workflows/__diagnostics-export.yml | 2 +- .../__export-file-baseline-information.yml | 4 +-- .github/workflows/__extractor-ram-threads.yml | 2 +- .github/workflows/__go-custom-queries.yml | 2 +- .../workflows/__go-tracing-autobuilder.yml | 2 +- .../__go-tracing-custom-build-steps.yml | 2 +- .../__go-tracing-legacy-workflow.yml | 2 +- .github/workflows/__init-with-registries.yml | 2 +- .../workflows/__javascript-source-root.yml | 2 +- .github/workflows/__ml-powered-queries.yml | 4 +-- .../workflows/__multi-language-autodetect.yml | 4 +-- ...ackaging-codescanning-config-inputs-js.yml | 4 +-- .../__packaging-config-inputs-js.yml | 4 +-- .github/workflows/__packaging-config-js.yml | 4 +-- .github/workflows/__packaging-inputs-js.yml | 4 +-- .github/workflows/__remote-config.yml | 2 +- .../workflows/__rubocop-multi-language.yml | 2 +- .github/workflows/__ruby.yml | 2 +- .github/workflows/__split-workflow.yml | 2 +- .github/workflows/__submit-sarif-failure.yml | 2 +- .github/workflows/__swift-custom-build.yml | 4 +-- .../__test-autobuild-working-dir.yml | 2 +- .github/workflows/__test-local-codeql.yml | 2 +- .github/workflows/__test-proxy.yml | 2 +- .github/workflows/__unset-environment.yml | 2 +- .github/workflows/__upload-ref-sha-input.yml | 2 +- .github/workflows/__with-checkout-path.yml | 2 +- .github/workflows/codescanning-config-cli.yml | 26 +++++++++---------- .github/workflows/debug-artifacts-failure.yml | 2 +- .github/workflows/debug-artifacts.yml | 2 +- .github/workflows/expected-queries-runs.yml | 4 +-- .github/workflows/query-filters.yml | 8 +++--- .../export-file-baseline-information.yml | 2 +- pr-checks/checks/ml-powered-queries.yml | 2 +- .../checks/multi-language-autodetect.yml | 2 +- ...ackaging-codescanning-config-inputs-js.yml | 2 +- .../checks/packaging-config-inputs-js.yml | 2 +- pr-checks/checks/packaging-config-js.yml | 2 +- pr-checks/checks/packaging-inputs-js.yml | 2 +- pr-checks/checks/swift-custom-build.yml | 2 +- pr-checks/sync.py | 2 +- 53 files changed, 70 insertions(+), 70 deletions(-) rename .github/{ => actions}/check-codescanning-config/action.yml (100%) rename .github/{ => actions}/check-codescanning-config/index.ts (100%) rename .github/{ => actions}/check-sarif/action.yml (100%) rename .github/{ => actions}/check-sarif/index.js (100%) rename .github/{ => actions}/prepare-test/action.yml (100%) rename .github/{ => actions}/query-filter-test/action.yml (96%) rename .github/{ => actions}/setup-swift/action.yml (100%) create mode 100644 .github/actions/update-bundle/action.yml diff --git a/.github/check-codescanning-config/action.yml b/.github/actions/check-codescanning-config/action.yml similarity index 100% rename from .github/check-codescanning-config/action.yml rename to .github/actions/check-codescanning-config/action.yml diff --git a/.github/check-codescanning-config/index.ts b/.github/actions/check-codescanning-config/index.ts similarity index 100% rename from .github/check-codescanning-config/index.ts rename to .github/actions/check-codescanning-config/index.ts diff --git a/.github/check-sarif/action.yml b/.github/actions/check-sarif/action.yml similarity index 100% rename from .github/check-sarif/action.yml rename to .github/actions/check-sarif/action.yml diff --git a/.github/check-sarif/index.js b/.github/actions/check-sarif/index.js similarity index 100% rename from .github/check-sarif/index.js rename to .github/actions/check-sarif/index.js diff --git a/.github/prepare-test/action.yml b/.github/actions/prepare-test/action.yml similarity index 100% rename from .github/prepare-test/action.yml rename to .github/actions/prepare-test/action.yml diff --git a/.github/query-filter-test/action.yml b/.github/actions/query-filter-test/action.yml similarity index 96% rename from .github/query-filter-test/action.yml rename to .github/actions/query-filter-test/action.yml index 1cb9e2c8c..6a2036382 100644 --- a/.github/query-filter-test/action.yml +++ b/.github/actions/query-filter-test/action.yml @@ -44,7 +44,7 @@ runs: env: CODEQL_ACTION_TEST_MODE: "true" - name: Check SARIF - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ inputs.sarif-file }} queries-run: ${{ inputs.queries-run}} diff --git a/.github/setup-swift/action.yml b/.github/actions/setup-swift/action.yml similarity index 100% rename from .github/setup-swift/action.yml rename to .github/actions/setup-swift/action.yml diff --git a/.github/actions/update-bundle/action.yml b/.github/actions/update-bundle/action.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1ae2c3598..020dca75c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,6 +16,6 @@ updates: schedule: interval: weekly - package-ecosystem: github-actions - directory: "/.github/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included. + directory: "/.github/actions/setup-swift/" # All subdirectories outside of "/.github/workflows" must be explicitly included. schedule: interval: weekly diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index cff1b5307..a5ab171d2 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index f99a4dc59..a8293b499 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index c62cff45c..c80b2ee7d 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index eac8e6494..5d81f5c07 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index e3bde8456..f1d2cb352 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -49,7 +49,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} env: CODEQL_FILE_BASELINE_INFORMATION: true - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} - name: Build code diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index b700b7644..2582a517d 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 3093f38aa..9a7b93779 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 3110cad8e..c43aae324 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index b9f4933dd..6ad73ad4a 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 05f98e4a1..2ce8d9297 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 5a70e1166..b8d87e7bf 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Init with registries diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 01002fd24..44ced0a43 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Move codeql-action diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index 1009afc30..db52beb45 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go @@ -85,7 +85,7 @@ jobs: retention-days: 7 - name: Check sarif - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif # Running on Windows requires CodeQL CLI 2.9.0+. if: "!(matrix.version == 'stable-20220120' && runner.os == 'Windows')" with: diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 560dafcf2..6a150b10a 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go @@ -71,7 +71,7 @@ jobs: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 7a8650437..6cb8c4983 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -69,7 +69,7 @@ jobs: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 5fde2b92c..e8426cffc 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -69,7 +69,7 @@ jobs: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 04b330fea..759f12cf9 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -68,7 +68,7 @@ jobs: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index 13887ba5d..6d5763b68 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -68,7 +68,7 @@ jobs: output: ${{ runner.temp }}/results - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 69e49c439..8b1440eed 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index a706b7375..96156ab74 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Ruby diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index cb1b505d5..a9e68ea51 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 7d3a2650e..3492061d6 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 3d16460aa..b3fb9ad12 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: actions/checkout@v3 diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index d10246db1..c04bc75c7 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init @@ -53,7 +53,7 @@ jobs: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} - name: Check working directory diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index b0baa3b3f..c151b4fab 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Test setup diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index f5c5ff669..cb7886549 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Fetch a CodeQL bundle diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 9895f0184..a5e24847d 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: ./../action/init diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 44c8e4856..7d863eebc 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index d235743d7..d7a6599e2 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 7ffc2ec45..e7067ae1d 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Set up Go diff --git a/.github/workflows/codescanning-config-cli.yml b/.github/workflows/codescanning-config-cli.yml index 272dc3a67..fe1d3f898 100644 --- a/.github/workflows/codescanning-config-cli.yml +++ b/.github/workflows/codescanning-config-cli.yml @@ -47,12 +47,12 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - name: Empty file - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: "{}" languages: javascript @@ -60,7 +60,7 @@ jobs: - name: Packs from input if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -72,7 +72,7 @@ jobs: - name: Packs from input with + if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -84,7 +84,7 @@ jobs: - name: Queries from input if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -96,7 +96,7 @@ jobs: - name: Queries from input with + if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -108,7 +108,7 @@ jobs: - name: Queries and packs from input with + if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -122,7 +122,7 @@ jobs: - name: Queries and packs from config if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -137,7 +137,7 @@ jobs: - name: Queries and packs from config overriden by input if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -152,7 +152,7 @@ jobs: - name: Queries and packs from config merging with input if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -172,7 +172,7 @@ jobs: - name: Multi-language packs from config if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -190,7 +190,7 @@ jobs: - name: Other config properties if: success() || failure() - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: | { @@ -209,7 +209,7 @@ jobs: if: success() || failure() env: CODEQL_PASS_CONFIG_TO_CLI: false - uses: ./../action/.github/check-codescanning-config + uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: "" languages: javascript diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index 0bbf47048..974012165 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: latest - uses: actions/setup-go@v4 diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 781ee9cbe..993700ec0 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -56,7 +56,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: ${{ matrix.version }} - uses: actions/setup-go@v4 diff --git a/.github/workflows/expected-queries-runs.yml b/.github/workflows/expected-queries-runs.yml index c9b79b7e9..b3b33e1df 100644 --- a/.github/workflows/expected-queries-runs.yml +++ b/.github/workflows/expected-queries-runs.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: latest - uses: ./../action/init @@ -39,7 +39,7 @@ jobs: upload: never - name: Check Sarif - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: js/incomplete-hostname-regexp,js/path-injection diff --git a/.github/workflows/query-filters.yml b/.github/workflows/query-filters.yml index c384a231d..e2f5642ea 100644 --- a/.github/workflows/query-filters.yml +++ b/.github/workflows/query-filters.yml @@ -23,12 +23,12 @@ jobs: uses: actions/checkout@v3 - name: Prepare test id: prepare-test - uses: ./.github/prepare-test + uses: ./.github/actions/prepare-test with: version: latest - name: Check SARIF for default queries with Single include, Single exclude - uses: ./../action/.github/query-filter-test + uses: ./../action/.github/actions/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: js/zipslip @@ -37,7 +37,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Check SARIF for query packs with Single include, Single exclude - uses: ./../action/.github/query-filter-test + uses: ./../action/.github/actions/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: js/zipslip,javascript/example/empty-or-one-block @@ -46,7 +46,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Check SARIF for query packs and local queries with Single include, Single exclude - uses: ./../action/.github/query-filter-test + uses: ./../action/.github/actions/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: js/zipslip,javascript/example/empty-or-one-block,inrepo-javascript-querypack/show-ifs diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index e3008a156..058c0eaf6 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -11,7 +11,7 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} env: CODEQL_FILE_BASELINE_INFORMATION: true - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} - name: Build code diff --git a/pr-checks/checks/ml-powered-queries.yml b/pr-checks/checks/ml-powered-queries.yml index d0628b32c..3aadbe025 100644 --- a/pr-checks/checks/ml-powered-queries.yml +++ b/pr-checks/checks/ml-powered-queries.yml @@ -28,7 +28,7 @@ steps: retention-days: 7 - name: Check sarif - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif # Running on Windows requires CodeQL CLI 2.9.0+. if: "!(matrix.version == 'stable-20220120' && runner.os == 'Windows')" with: diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index 73d520799..70175f0c2 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -10,7 +10,7 @@ steps: db-location: "${{ runner.temp }}/customDbLocation" tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} diff --git a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml index 644459312..ccef0a226 100644 --- a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml +++ b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml @@ -21,7 +21,7 @@ steps: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/pr-checks/checks/packaging-config-inputs-js.yml b/pr-checks/checks/packaging-config-inputs-js.yml index d942dceaf..3af646619 100644 --- a/pr-checks/checks/packaging-config-inputs-js.yml +++ b/pr-checks/checks/packaging-config-inputs-js.yml @@ -17,7 +17,7 @@ steps: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/pr-checks/checks/packaging-config-js.yml b/pr-checks/checks/packaging-config-js.yml index 1d39ba8ca..42d955d47 100644 --- a/pr-checks/checks/packaging-config-js.yml +++ b/pr-checks/checks/packaging-config-js.yml @@ -16,7 +16,7 @@ steps: upload-database: false - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/pr-checks/checks/packaging-inputs-js.yml b/pr-checks/checks/packaging-inputs-js.yml index 6a254bd96..0d213f130 100644 --- a/pr-checks/checks/packaging-inputs-js.yml +++ b/pr-checks/checks/packaging-inputs-js.yml @@ -16,7 +16,7 @@ steps: output: "${{ runner.temp }}/results" - name: Check results - uses: ./../action/.github/check-sarif + uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index 1fc1dd5f3..8d626d932 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -11,7 +11,7 @@ steps: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/setup-swift + - uses: ./../action/.github/actions/setup-swift with: codeql-path: ${{steps.init.outputs.codeql-path}} - name: Check working directory diff --git a/pr-checks/sync.py b/pr-checks/sync.py index a5f05c1dc..ef2e06cfb 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -79,7 +79,7 @@ def writeHeader(checkStream): { 'name': 'Prepare test', 'id': 'prepare-test', - 'uses': './.github/prepare-test', + 'uses': './.github/actions/prepare-test', 'with': { 'version': '${{ matrix.version }}' }