diff --git a/.github/workflows/__ref-commit-input.yml b/.github/workflows/__ref-commit-input.yml new file mode 100644 index 000000000..696106cba --- /dev/null +++ b/.github/workflows/__ref-commit-input.yml @@ -0,0 +1,69 @@ +# Warning: This file is generated automatically, and should not be modified. +# Instead, please modify the template in the pr-checks directory and run: +# pip install ruamel.yaml && python3 sync.py +# to regenerate this file. + +name: PR Check - 'ref' and 'sha' from inputs +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GO111MODULE: auto +on: + push: + branches: + - main + - v1 + pull_request: + types: + - opened + - synchronize + - reopened + - ready_for_review + workflow_dispatch: {} +jobs: + ref-commit-input: + strategy: + matrix: + version: + - stable-20201028 + - stable-20210319 + - stable-20210809 + - cached + - latest + - nightly-latest + os: + - ubuntu-latest + - macos-latest + - windows-latest + name: "'ref' and 'sha' from inputs" + runs-on: ${{ matrix.os }} + steps: + - name: Check out repository + uses: actions/checkout@v2 + - name: Prepare test + id: prepare-test + uses: ./.github/prepare-test + with: + version: ${{ matrix.version }} + - uses: ./../action/init + with: + tools: ${{ steps.prepare-test.outputs.tools-url }} + languages: cpp,csharp,java,javascript,python + config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ + github.sha }} + - name: Build code + shell: bash + run: ./build.sh + - uses: ./../action/analyze + with: + ref: refs/heads/main + sha: dc1e2655b666a6d3624deba0983c9e6105d92dd4 + env: + TEST_MODE: true + - uses: ./../action/upload-sarif + with: + ref: refs/heads/main + sha: dc1e2655b666a6d3624deba0983c9e6105d92dd4 + env: + TEST_MODE: true + env: + INTERNAL_CODEQL_ACTION_DEBUG_LOC: true diff --git a/pr-checks/checks/ref-commit-input.yml b/pr-checks/checks/ref-commit-input.yml new file mode 100644 index 000000000..3876fd45b --- /dev/null +++ b/pr-checks/checks/ref-commit-input.yml @@ -0,0 +1,23 @@ +name: "'ref' and 'sha' from inputs" +description: "Checks that specifying 'ref' and 'sha' as inputs works" +steps: + - uses: ./../action/init + with: + tools: ${{ steps.prepare-test.outputs.tools-url }} + languages: cpp,csharp,java,javascript,python + config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} + - name: Build code + shell: bash + run: ./build.sh + - uses: ./../action/analyze + with: + ref: 'refs/heads/main' + sha: 'dc1e2655b666a6d3624deba0983c9e6105d92dd4' + env: + TEST_MODE: true + - uses: ./../action/upload-sarif + with: + ref: 'refs/heads/main' + sha: 'dc1e2655b666a6d3624deba0983c9e6105d92dd4' + env: + TEST_MODE: true diff --git a/src/analyze-action.ts b/src/analyze-action.ts index 7c2a810e0..39b23574e 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -187,7 +187,7 @@ async function run() { apiDetails, logger ); - core.setOutput('sarif-id', uploadResult.sarifID); + core.setOutput("sarif-id", uploadResult.sarifID); } else { logger.info("Not uploading results"); } diff --git a/src/upload-sarif-action.ts b/src/upload-sarif-action.ts index 8ab334b84..830a158ab 100644 --- a/src/upload-sarif-action.ts +++ b/src/upload-sarif-action.ts @@ -63,7 +63,7 @@ async function run() { apiDetails, getActionsLogger() ); - core.setOutput('sarif-id', uploadResult.sarifID); + core.setOutput("sarif-id", uploadResult.sarifID); if (actionsUtil.getRequiredInput("wait-for-processing") === "true") { await upload_lib.waitForProcessing( parseRepositoryNwo(getRequiredEnvParam("GITHUB_REPOSITORY")),