diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks-codecov.yaml similarity index 76% rename from .github/workflows/checks.yaml rename to .github/workflows/checks-codecov.yaml index 1ef83900c..85a878b57 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks-codecov.yaml @@ -59,7 +59,7 @@ jobs: with: go-version-file: go.mod cache: false - + - name: Check go versions uses: enterprise-contract/github-workflows/golang-version-check@main @@ -102,44 +102,6 @@ jobs: files: ./coverage-integration.out flags: integration - Acceptance: - runs-on: ubuntu-latest - steps: - # Disabled until we figure out the "Could not resolve host: github.com" in - # acceptance tests - # - name: Harden Runner - # uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0 - # with: - # egress-policy: audit - # disable-telemetry: true - - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - - name: Restore Cache - uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 - with: - key: main - path: '**' - - - name: Setup Go environment - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 - with: - go-version-file: go.mod - cache: false - - - name: Update podman - run: | - "${GITHUB_WORKSPACE}/hack/ubuntu-podman-update.sh" - - - name: Acceptance test - run: make acceptance - - - name: Upload coverage report - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0 - with: - files: ./coverage-acceptance.out - flags: acceptance Tools: runs-on: ubuntu-latest diff --git a/.github/workflows/checks-sealights.yaml b/.github/workflows/checks-sealights.yaml index fa8feb25e..ef9d11d47 100644 --- a/.github/workflows/checks-sealights.yaml +++ b/.github/workflows/checks-sealights.yaml @@ -84,7 +84,7 @@ jobs: tar -xzf ./sealights-go-agent.tar.gz && tar -xzf ./sealights-slcli.tar.gz rm -f ./sealights-go-agent.tar.gz ./sealights-slcli.tar.gz ./slgoagent -v 2> /dev/null | grep version && ./slcli -v 2> /dev/null | grep version - + - name: Write SeaLights token into file run: echo "${SEALIGHTS_AGENT_TOKEN}" > sltoken.txt env: @@ -118,7 +118,7 @@ jobs: id: sealights-scan run: | echo "[Sealights] Running the SeaLights scan" - ./slcli scan --bsid buildSessionId.txt --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/conforma/cli.git --scmVersion “0” --scmProvider github + ./slcli scan --bsid buildSessionId.txt --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/conforma/cli.git --scmVersion "0" --scmProvider github echo bsid=$(< buildSessionId.txt) | tee -a "$GITHUB_OUTPUT" - name: clean all SeaLights secret stuff run: | @@ -134,7 +134,7 @@ jobs: Test: runs-on: ubuntu-latest needs: Initialize - steps: + steps: - name: Restore workspace uses: actions/cache@v4 with: @@ -181,4 +181,4 @@ jobs: run: | cat ./junit-acceptance.xml ./slcli test upload-reports --bsid=$BSID --report-location ./junit-acceptance.xml - ./slcli test end-stage --bsid=$BSID --executionId "Acceptance Tests" \ No newline at end of file + ./slcli test end-stage --bsid=$BSID --executionId "Acceptance Tests"