Skip to content

Commit

Permalink
Update test.yml (#733)
Browse files Browse the repository at this point in the history
  • Loading branch information
attiasas authored Aug 14, 2024
1 parent 4cb8f40 commit ca4e28a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/oidc-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
JF_GIT_BASE_BRANCH: ${{ matrix.branch }}
JF_WORKING_DIR: ./testdata/projects/noIssuesProject
JF_FAIL: "FALSE"
JFROG_CLI_LOG_LEVEL: "DEBUG"
with:
oidc-provider-name: ${{ env.OIDC_PROVIDER_NAME }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:

- name: Run Tests
if: ${{ matrix.suite.name != 'GitHub Integration' || matrix.os == 'ubuntu' }}
run: go test github.com/jfrog/frogbot/v2/${{ matrix.suite.package }} -v -race -timeout 40m -cover
run: go test github.com/jfrog/frogbot/v2/${{ matrix.suite.package }} -v -race -timeout 50m -cover
env:
JF_URL: ${{ secrets.PLATFORM_URL }}
JF_ACCESS_TOKEN: ${{ secrets.PLATFORM_ADMIN_TOKEN }}
Expand Down Expand Up @@ -241,4 +241,4 @@ jobs:
JF_ACCESS_TOKEN: ${{ secrets.PLATFORM_ADMIN_TOKEN }}
FROGBOT_TESTS_BB_SERVER_TOKEN: ${{ secrets.FROGBOT_TESTS_BB_SERVER_TOKEN }}
JFROG_CLI_LOG_LEVEL: "DEBUG"
run: go test -v bitbucket_server_test.go commands.go integrationutils.go
run: go test -v bitbucket_server_test.go commands.go integrationutils.go
6 changes: 3 additions & 3 deletions utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -340,14 +340,14 @@ func validateBranchName(branchName string) error {
}
branchNameWithoutPlaceHolders := formatStringWithPlaceHolders(branchName, "", "", "", "", true)
if branchInvalidCharsRegex.MatchString(branchNameWithoutPlaceHolders) {
return fmt.Errorf(branchInvalidChars)
return errors.New(branchInvalidChars)
}
// Prefix cannot be '-'
if branchName[0] == '-' {
return fmt.Errorf(branchInvalidPrefix)
return errors.New(branchInvalidPrefix)
}
if len(branchName) > branchCharsMaxLength {
return fmt.Errorf(branchInvalidLength)
return errors.New(branchInvalidLength)
}
return nil
}
Expand Down

0 comments on commit ca4e28a

Please sign in to comment.