From ca4e28a9355a99021f6b84346c12c538e2116311 Mon Sep 17 00:00:00 2001 From: Assaf Attias <49212512+attiasas@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:54:55 +0300 Subject: [PATCH] Update test.yml (#733) --- .github/workflows/oidc-test.yml | 1 + .github/workflows/test.yml | 4 ++-- utils/utils.go | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/oidc-test.yml b/.github/workflows/oidc-test.yml index 0afbdca89..11a50346e 100644 --- a/.github/workflows/oidc-test.yml +++ b/.github/workflows/oidc-test.yml @@ -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 }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd2418461..9002d266f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 }} @@ -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 \ No newline at end of file + run: go test -v bitbucket_server_test.go commands.go integrationutils.go diff --git a/utils/utils.go b/utils/utils.go index 56591d855..8c1291959 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -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 }