From 8fbb9dd43964807334534317562f3986033e0b9b Mon Sep 17 00:00:00 2001
From: Gary Holtz <gholtz@gitlab.com>
Date: Thu, 12 May 2022 14:12:00 -0500
Subject: [PATCH 1/4] Fixing some yml/CI issues

---
 .gitlab-ci.yml      | 9 ++++++++-
 pkg/git/git_test.go | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d97915154..f5e41b37c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ variables:
 include:
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
-  - local: .gitlab/ci/*.gitlab-ci.yml
 
 gosec-sast:
   before_script:
@@ -38,3 +37,11 @@ code_navigation:
   artifacts:
     reports:
       lsif: dump.lsif
+
+run_tests:
+  variables:
+    GITLAB_TOKEN: "qRC87Xg9Wd46RhB8J8sp"
+    # FROM_PACKAGE: "packages/easy-coding-standard"
+    # TO_REPOSITORY: "https://github.com/symplify/easy-coding-standard"
+  script:
+    - make test
diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
index 9d57a806f..60b6919d4 100644
--- a/pkg/git/git_test.go
+++ b/pkg/git/git_test.go
@@ -291,7 +291,7 @@ func TestGetRemoteURL(t *testing.T) {
 		{
 			name:        "isInvalid",
 			remoteAlias: "origin",
-			want:        "profclems/glab",
+			want:        "gitlab-org/cli",
 		},
 	}
 	for _, tt := range tests {
-- 
GitLab


From 470b958ecd8104333a575d19251f4dd5d5055c50 Mon Sep 17 00:00:00 2001
From: Gary Holtz <gholtz@gitlab.com>
Date: Thu, 12 May 2022 14:18:55 -0500
Subject: [PATCH 2/4] Go version bump

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5e41b37c..dc93c69bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ workflow:
     #
 
 default:
-  image: golang:1.15
+  image: golang:1.17
 
 # Disable DIND for SAST because we need to execute a before_script in the gosec-sast job
 variables:
-- 
GitLab


From 20ebf7c702d4221b1432ea35c6e833b82a621d2e Mon Sep 17 00:00:00 2001
From: Gary Holtz <gholtz@gitlab.com>
Date: Thu, 12 May 2022 14:22:12 -0500
Subject: [PATCH 3/4] Attempt to only run pipelines on commits

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc93c69bb..74a7bf818 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ workflow:
     - if: '$CI_MERGE_REQUEST_IID'
     # For default branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
     # - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    # Temporarly create Ci for every branch:
-    - if: '$CI_COMMIT_BRANCH'
+    # # Temporarly create Ci for every branch:
+    # - if: '$CI_COMMIT_BRANCH'
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
     # For stable branches, create a pipeline.
-- 
GitLab


From 2a56d82426d25360a487fd413e1b43092af7df58 Mon Sep 17 00:00:00 2001
From: Gary Holtz <gholtz@gitlab.com>
Date: Thu, 12 May 2022 14:32:55 -0500
Subject: [PATCH 4/4] Trying to fix pipeline tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74a7bf818..a279e9d0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ code_navigation:
 
 run_tests:
   variables:
-    GITLAB_TOKEN: "qRC87Xg9Wd46RhB8J8sp"
+    # GITLAB_TOKEN: "qRC87Xg9Wd46RhB8J8sp"
     # FROM_PACKAGE: "packages/easy-coding-standard"
     # TO_REPOSITORY: "https://github.com/symplify/easy-coding-standard"
   script:
-- 
GitLab