From 45042a9e5bccafe02e0a14dcf1ab55eae3fe94ab Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 10:53:38 +1200
Subject: [PATCH 1/9] Chnaged to new syntax for env variables

---
 .github/workflows/deploy.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index faa3ae1d6..b7a082f83 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,26 +20,25 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo ::set-env name=TAG::${GITHUB_REF:10}
+        echo "name=TAG::${{GITHUB_REF:10}}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |
-        [[ $TAG == 'master' ]] && echo ::set-env name=ENVM::alpha || echo ::set-env name=ENVM::$TAG
-
+        [[ $TAG == 'master' ]] && echo "name=ENVM::alpha" >> $GITHUB_ENV || echo "name=ENVM::$TAG" >> $GITHUB_ENV
     - name: Set env type var and secret
       run: |
         if [[ $ENVM == 'v'* ]];then 
-          echo ::set-env name=ENVM_TYPE::live
-          echo ::set-env name=ENV_SECRET::${{ secrets.ENV_SECRET_LIVE }} 
+          echo "name=ENVM_TYPE::live" >> $GITHUB_ENV
+          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_LIVE }}" >> $GITHUB_ENV
         elif [[ $ENVM == 'beta'* ]];then 
-          echo ::set-env name=ENVM_TYPE::beta
-          echo ::set-env name=ENV_SECRET::${{ secrets.ENV_SECRET_BETA }}
+          echo "name=ENVM_TYPE::beta" >> $GITHUB_ENV
+          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_BETA }}" >> $GITHUB_ENV
         elif [[ $ENVM == 'gamma'* ]];then 
-          echo ::set-env name=ENVM_TYPE::gamma 
-          echo ::set-env name=ENV_SECRET::${{ secrets.ENV_SECRET_GAMMA }}
+          echo "name=ENVM_TYPE::gamma" >> $GITHUB_ENV
+          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_GAMMA }}" >> $GITHUB_ENV
         else
-          echo ::set-env name=ENVM_TYPE::alpha 
-          echo ::set-env name=ENV_SECRET::${{ secrets.ENV_SECRET_ALPHA }}
+          echo "name=ENVM_TYPE::alpha" >> $GITHUB_ENV
+          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_ALPHA }}" >> $GITHUB_ENV
         fi
 
     - name: Check vars
@@ -96,4 +95,4 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
         ECR_REPOSITORY: vly-${{ env.ENVM_TYPE }}  
       run: |
-        aws ecs update-service --service vly-${{ env.ENVM_TYPE }}  --cluster vly-${{ env.ENVM_TYPE }}-ECSCluster --force-new-deployment --desired-count 3 --deployment-configuration maximumPercent=100,minimumHealthyPercent=50
+        aws ecs update-service --service vly-${{ env.ENVM_TYPE }}  --cluster vly-${{ env.ENVM_TYPE }}-ECSCluster --force-new-deployment --desired-count 3 --deployment-configuration maximumPercent=100,minimumHealthyPercent=50
\ No newline at end of file

From 3d1f9237f600fa30c8059827d1fdb51d1074f6e9 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 10:56:03 +1200
Subject: [PATCH 2/9] Typo

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b7a082f83..43ce0f676 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${{GITHUB_REF:10}}" >> $GITHUB_ENV 
+        echo "name=TAG::${{ GITHUB_REF:10 }}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From be3aa89e456eeceb649ed42901eba9e77db3ba52 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 11:48:28 +1200
Subject: [PATCH 3/9] Typo

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 43ce0f676..c398436c0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${{ GITHUB_REF:10 }}" >> $GITHUB_ENV 
+        echo "name=TAG::${ GITHUB_REF:10 }" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From cd0df237eb0cf48fc2d983c85de8e144d3899ce1 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 11:54:52 +1200
Subject: [PATCH 4/9] bad substitution

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c398436c0..ebaa1dbab 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${ GITHUB_REF:10 }" >> $GITHUB_ENV 
+        echo "name=TAG::$( GITHUB_REF:10 )" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From 224d27bf605296d089a1472486abc2c36cd651e5 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 11:56:47 +1200
Subject: [PATCH 5/9] bad substitution

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ebaa1dbab..43ce0f676 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::$( GITHUB_REF:10 )" >> $GITHUB_ENV 
+        echo "name=TAG::${{ GITHUB_REF:10 }}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From 553402fa5df57ca41158c8c5eda944a643cef367 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 11:59:15 +1200
Subject: [PATCH 6/9] trimmed tag name

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 43ce0f676..f766e214a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${{ GITHUB_REF:10 }}" >> $GITHUB_ENV 
+        echo "name=TAG::${{ github.event.release.tag_name }}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From a375455fe4bf49afd7ea3ca43bb096d9bc419cd5 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 12:01:24 +1200
Subject: [PATCH 7/9] trim tag using ${GITHUB_REF#refs/tags/}

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f766e214a..0fe5e602e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${{ github.event.release.tag_name }}" >> $GITHUB_ENV 
+        echo "name=TAG::${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |

From 604aa698917c3fcf2962b25e988df512a8a80d84 Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 12:06:32 +1200
Subject: [PATCH 8/9] Fixed the bad syntax

---
 .github/workflows/deploy.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0fe5e602e..efecd7a28 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,25 +20,25 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "name=TAG::${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV 
+        echo "TAG=:${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |
-        [[ $TAG == 'master' ]] && echo "name=ENVM::alpha" >> $GITHUB_ENV || echo "name=ENVM::$TAG" >> $GITHUB_ENV
+        [[ $TAG == 'master' ]] && echo "ENVM=alpha" >> $GITHUB_ENV || echo "ENVM=${{TAG}}" >> $GITHUB_ENV
     - name: Set env type var and secret
       run: |
         if [[ $ENVM == 'v'* ]];then 
-          echo "name=ENVM_TYPE::live" >> $GITHUB_ENV
-          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_LIVE }}" >> $GITHUB_ENV
+          echo "ENVM_TYPE=live" >> $GITHUB_ENV
+          echo "ENV_SECRET=${{ secrets.ENV_SECRET_LIVE }}" >> $GITHUB_ENV
         elif [[ $ENVM == 'beta'* ]];then 
-          echo "name=ENVM_TYPE::beta" >> $GITHUB_ENV
-          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_BETA }}" >> $GITHUB_ENV
+          echo "ENVM_TYPE=beta" >> $GITHUB_ENV
+          echo "ENV_SECRET=${{ secrets.ENV_SECRET_BETA }}" >> $GITHUB_ENV
         elif [[ $ENVM == 'gamma'* ]];then 
-          echo "name=ENVM_TYPE::gamma" >> $GITHUB_ENV
-          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_GAMMA }}" >> $GITHUB_ENV
+          echo "ENVM_TYPE=gamma" >> $GITHUB_ENV
+          echo "ENV_SECRET=${{ secrets.ENV_SECRET_GAMMA }}" >> $GITHUB_ENV
         else
-          echo "name=ENVM_TYPE::alpha" >> $GITHUB_ENV
-          echo "name=ENV_SECRET::${{ secrets.ENV_SECRET_ALPHA }}" >> $GITHUB_ENV
+          echo "ENVM_TYPE=alpha" >> $GITHUB_ENV
+          echo "ENV_SECRET=${{ secrets.ENV_SECRET_ALPHA }}" >> $GITHUB_ENV
         fi
 
     - name: Check vars

From 1f8abbf0d94d3f11966abe3f987e049646146c5d Mon Sep 17 00:00:00 2001
From: Vaughan Fergusson <vaughan@pamfergusson.org.nz>
Date: Tue, 27 Jul 2021 12:08:15 +1200
Subject: [PATCH 9/9] Fix

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index efecd7a28..69cba8637 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,11 +20,11 @@ jobs:
     
     - name: Set tag vars
       run: |
-        echo "TAG=:${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV 
+        echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV 
 
     - name: Set var for tags vs PR merge
       run: |
-        [[ $TAG == 'master' ]] && echo "ENVM=alpha" >> $GITHUB_ENV || echo "ENVM=${{TAG}}" >> $GITHUB_ENV
+        [[ $TAG == 'master' ]] && echo "ENVM=alpha" >> $GITHUB_ENV || echo "ENVM=${TAG}" >> $GITHUB_ENV
     - name: Set env type var and secret
       run: |
         if [[ $ENVM == 'v'* ]];then