Update config yml for tyk, lint sync-automation tmpl

TykTechnologies · Jul 3, 2023 · 793db38 · 793db38
1 parent d3b824b
commit 793db38
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -128,6 +128,16 @@ policy:
                 - "1.19-bullseye"
               features:
                 - go1.19
+            release-5.1.0:
+              active: true
+              sourcebranch: master
+              reviewcount: 0
+              goversion: 1.19-bullseye
+              tests:
+                - "Go 1.19.x Redis 5"
+                - "1.19-bullseye"
+              features:
+                - go1.19
             release-4-lts:
               sourcebranch: master
               active: true
@@ -136,9 +146,9 @@ policy:
               features:
                 - el7
               goversion: 1.15
-            release-5.0.2:
+            release-5.0.3:
               active: true
-              sourcebranch: release-5.0.1
+              sourcebranch: release-5-lts
               tests:
                 - "Go 1.16 Redis 5"
                 - "1.16"
@@ -156,6 +166,13 @@ policy:
               goversion: 1.16
               features:
                 - el7
+            release-4.0.14:
+              sourcebranch: release-4-lts
+              active: true
+              tests:
+                - "Go 1.15 Redis 6"
+              features:
+                - el7
     tyk-analytics:
       description: >-
         Dashboard for the Tyk API Gateway

diff --git a/policy/templates/sync/.github/workflows/sync-automation.yml b/policy/templates/sync/.github/workflows/sync-automation.yml
@@ -32,8 +32,8 @@ on:
       - {{ $file }}
     {{- end }}
 
-  env:
-    AUTOMERGE: false
+env:
+  AUTOMERGE: false
 
 jobs:
   sync:
@@ -119,7 +119,7 @@ jobs:
 
       - name: Enable automerge for the created PR
         id: enable-automerge
-        if: ${{ env.AUTOMERGE == 'true' }}
+        if: ${{`{{ env.AUTOMERGE == 'true' `}}}}
         run: |
           gh pr merge $PULL --auto --squash --subject "[CI] Sync automation: Syncing commits from master" --body "Picking CI changes from the commit $COMMIT"
         env: