Skip to content

Commit

Permalink
Merge branch 'main' into go-git
Browse files Browse the repository at this point in the history
  • Loading branch information
azeemshaikh38 committed Mar 15, 2023
2 parents 132b9df + 603263c commit 78cc39d
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 8 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ jobs:
- name: Configure ldflags
id: ldflags
run: echo "version_flags=$(./scripts/version-ldflags)" >> "$GITHUB_OUTPUT"
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
- name: Run GoReleaser
id: run-goreleaser
uses: goreleaser/goreleaser-action@8f67e590f2d095516493f017008adc464e63adb1 # v2.5.0
Expand All @@ -61,7 +55,6 @@ jobs:
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
VERSION_LDFLAGS: ${{ steps.ldflags.outputs.version_flags }}
- name: Generate subject
id: hash
Expand Down
2 changes: 1 addition & 1 deletion checks/ci_tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func CITests(c *checker.CheckRequest) checker.CheckResult {
rawData, err := raw.CITests(c.RepoClient)
if err != nil {
e := sce.WithMessage(sce.ErrScorecardInternal, err.Error())
return checker.CreateRuntimeErrorResult(CheckCodeReview, e)
return checker.CreateRuntimeErrorResult(CheckCITests, e)
}

// Return raw results.
Expand Down
45 changes: 45 additions & 0 deletions checks/ci_tests_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2023 OpenSSF Scorecard Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package checks

import (
"fmt"
"testing"

"github.com/golang/mock/gomock"

"github.com/ossf/scorecard/v4/checker"
mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
)

func TestCITestsRuntimeError(t *testing.T) {
t.Parallel()

ctrl := gomock.NewController(t)
mockRepoClient := mockrepo.NewMockRepoClient(ctrl)
//nolint:goerr113
mockRepoClient.EXPECT().ListCommits().Return(nil, fmt.Errorf("some runtime error")).AnyTimes()

req := checker.CheckRequest{
RepoClient: mockRepoClient,
}
res := CITests(&req)

want := "CI-Tests"
if res.Name != want {
t.Errorf("got: %q, want: %q", res.Name, want)
}
ctrl.Finish()
}

0 comments on commit 78cc39d

Please sign in to comment.