Remove master from CI config/scripts (#3421)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jaegertracing · Dec 2, 2021 · 5015a36 · 5015a36
1 parent 7872d1b
commit 5015a36
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 80 deletions.
diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml
@@ -2,14 +2,10 @@ name: Build all-in-one
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   all-in-one:

diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
@@ -2,14 +2,10 @@ name: Build binaries
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   build-binaries:

diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml
@@ -2,14 +2,10 @@ name: CIT Cassandra
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   cassandra:

diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml
@@ -2,14 +2,10 @@ name: CIT Crossdock
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   crossdock:

diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
@@ -2,14 +2,10 @@ name: Build docker images
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   docker-images:

diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml
@@ -2,14 +2,10 @@ name: CIT Elasticsearch
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   elasticsearch:

diff --git a/.github/workflows/ci-grpc-badger.yml b/.github/workflows/ci-grpc-badger.yml
@@ -2,14 +2,10 @@ name: CIT gRPC And Badger
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   grpc-and-badger:

diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml
@@ -2,14 +2,10 @@ name: CIT Hotrod
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   hotrod:

diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml
@@ -2,14 +2,10 @@ name: CIT Kafka
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   kafka:

diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml
@@ -2,14 +2,10 @@ name: Protogen Validation
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   protogen:

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
@@ -2,14 +2,10 @@ name: Unit Tests
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   unit-tests:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,14 +2,11 @@ name: "CodeQL"
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
+
   schedule:
     - cron: '31 6 * * 1'
 

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -2,14 +2,10 @@ name: FOSSA
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [main]
 
   pull_request:
-    branches:
-      - master
-      - main
+    branches: [main]
 
 jobs:
   fossa-license-scan:

diff --git a/scripts/build-crossdock.sh b/scripts/build-crossdock.sh
@@ -8,7 +8,7 @@ COMMIT=${GITHUB_SHA::8}
 make build-and-run-crossdock
 
 # Only push images to dockerhub/quay.io for the main branch
-if [[ $BRANCH == "master" || "$BRANCH" == "main" ]]; then
+if [[ "$BRANCH" == "main" ]]; then
   echo 'upload images to dockerhub/quay.io'
   REPO=jaegertracing/test-driver
   IMAGE_TAGS=$(bash scripts/compute-tags.sh $REPO)

diff --git a/scripts/build-upload-a-docker-image.sh b/scripts/build-upload-a-docker-image.sh
@@ -49,7 +49,7 @@ if [[ "${local_test_only}" = "Y" ]]; then
     PUSHTAG="type=image, push=true"
 else
     # Only push multi-arch images to dockerhub/quay.io for main branch or for release tags vM.N.P
-    if [[ "$BRANCH" == "master" || "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    if [[ "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 	    echo "build docker images and upload to dockerhub/quay.io, BRANCH=$BRANCH"
 	    bash scripts/docker-login.sh
 	    PUSHTAG="type=image, push=true"