fix linter, run node 14 tests only on macos amd

jfrog · May 20, 2024 · eab984f · eab984f
1 parent c08b473
commit eab984f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,11 +14,12 @@ concurrency:
 jobs:
   unit-test:
     name: ${{ matrix.os }}, node ${{ matrix.node }}, python ${{ matrix.python }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu, windows, macos ]
+        # macos-latest = arm64, macos-14-large = amd64
+        os: [ ubuntu-latest, windows-latest, macos-latest, macos-14-large ]
         node: [ 14, 16, 16.9 ]
         include:
           - node: "14"
@@ -27,6 +28,10 @@ jobs:
             python: "3.9"
           - node: "16.9"
             python: "3.x"
+        exclude:
+          # MacOS with ARM does not support node 14
+          - os: macos-latest
+            node: 14
 
     steps:
       - uses: actions/checkout@v4

diff --git a/utils/masking.go b/utils/masking.go
@@ -11,5 +11,5 @@ const CredentialsInUrlRegexp = `(?:http|https|git)://.+@`
 // Remove the credentials information from the line.
 func RemoveCredentials(pattern *gofrogcmd.CmdOutputPattern) (string, error) {
 	splitResult := strings.Split(pattern.MatchedResults[0], "//")
-	return strings.Replace(pattern.Line, pattern.MatchedResults[0], splitResult[0]+"//***@", -1), nil
+	return strings.ReplaceAll(pattern.Line, pattern.MatchedResults[0], splitResult[0]+"//***@"), nil
 }