From f5fab440ad0d99ae31480b70242844a3097a1dfc Mon Sep 17 00:00:00 2001
From: Dave Henderson <dhenderson@gmail.com>
Date: Sat, 18 Jun 2022 12:52:55 -0400
Subject: [PATCH] Enable CI for 3.11.x branch

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
---
 .github/workflows/build.yml           |  4 ++--
 .github/workflows/codeql-analysis.yml |  4 ++--
 .github/workflows/docker.yml          | 16 ++++++++--------
 .github/workflows/image-scan.yml      |  4 ++--
 .github/workflows/label.yml           |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index caf0458cc..650ee12b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: Build
 on:
   push:
-    branches: [ master ]
+    branches: [ main, 3.11.x]
   pull_request:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
 
 jobs:
   linux-build:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0abf7c96e..863098963 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
   schedule:
     - cron: '42 18 * * 0'
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 100ca6c25..f1062f756 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,9 +1,9 @@
 name: Docker Build
 on:
   push:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
 
 jobs:
   docker-build:
@@ -48,7 +48,7 @@ jobs:
         fi
         echo $GITHUB_ENV
       if: github.repository == 'hairyhenderson/gomplate'
-    - name: Build & Push (non-master)
+    - name: Build & Push (non-main)
       run: |
         set -ex
         make docker-multi COMMIT=${{ github.sha }} DOCKER_REPO=localhost:5000/gomplate BUILDX_ACTION=--push
@@ -56,26 +56,26 @@ jobs:
         docker buildx imagetools create --dry-run -t localhost:5000/gomplate:dev localhost:5000/gomplate:latest
         docker buildx imagetools create --dry-run -t localhost:5000/gomplate:dev-slim localhost:5000/gomplate:slim
         docker buildx imagetools create --dry-run -t localhost:5000/gomplate:dev-alpine localhost:5000/gomplate:alpine
-      if: github.repository != 'hairyhenderson/gomplate' || (github.ref != 'refs/heads/master' && env.is_tag != 'true')
+      if: github.repository != 'hairyhenderson/gomplate' || (github.ref != 'refs/heads/main' && env.is_tag != 'true')
     - name: Login to GHCR
       uses: docker/login-action@v2.0.0
       with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      if: github.repository == 'hairyhenderson/gomplate' && (github.ref == 'refs/heads/master' || env.is_tag == 'true')
+      if: github.repository == 'hairyhenderson/gomplate' && (github.ref == 'refs/heads/main' || env.is_tag == 'true')
     - name: Login to DockerHub
       uses: docker/login-action@v2.0.0
       with:
           # NOTE: DOCKERHUB_TOKEN and DOCKERHUB_USERNAME must be present in https://github.com/hairyhenderson/gomplate/settings
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      if: github.repository == 'hairyhenderson/gomplate' && (github.ref == 'refs/heads/master' || env.is_tag == 'true')
-    - name: Build & Push (master)
+      if: github.repository == 'hairyhenderson/gomplate' && (github.ref == 'refs/heads/main' || env.is_tag == 'true')
+    - name: Build & Push (main)
       run: |
         make docker-multi COMMIT=${{ github.sha }} DOCKER_REPO=hairyhenderson/gomplate BUILDX_ACTION=--push
         make docker-multi COMMIT=${{ github.sha }} DOCKER_REPO=ghcr.io/hairyhenderson/gomplate BUILDX_ACTION=--push
-      if: github.repository == 'hairyhenderson/gomplate' && github.ref == 'refs/heads/master'
+      if: github.repository == 'hairyhenderson/gomplate' && github.ref == 'refs/heads/main'
     - name: Build & Push (tagged release)
       run: |
         make docker-multi COMMIT=${{ github.sha }} DOCKER_REPO=hairyhenderson/gomplate BUILDX_ACTION=--push
diff --git a/.github/workflows/image-scan.yml b/.github/workflows/image-scan.yml
index cba73b2a3..85c23411a 100644
--- a/.github/workflows/image-scan.yml
+++ b/.github/workflows/image-scan.yml
@@ -1,9 +1,9 @@
 name: Docker Image Scan
 on:
   push:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
 
 jobs:
   docker-build:
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 789ce1bf5..55db4b09d 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -2,7 +2,7 @@ name: Labeler
 on:
   pull_request_target:
     types: [ opened ]
-    branches: [ master ]
+    branches: [ main, 3.11.x ]
 
 jobs:
   label: