From bef51b9105f203f2eb8ddb74155adcb6a25eaafb Mon Sep 17 00:00:00 2001
From: Mohsan Jaffery <mohsan.jaffery@blackspring.co.uk>
Date: Sat, 16 May 2020 01:09:29 +0100
Subject: [PATCH] Updates to build steps for S3Copy function

---
 .github/workflows/release.yaml | 10 +++++-----
 templates/main.yaml            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 25ecdb9..5fc78d8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -52,12 +52,12 @@ jobs:
           prerelease: false
       # Package and Upload Archive
       - name: Pre-Package Copy Function
-        run: cd source/witch/ && mkdir nodejs && npm install --prefix nodejs mime-types && cp witch.js nodejs/node_modules/ && zip -r ../../witch.zip nodejs  && cd ../../
+        run: cd source/witch/ && npm install --prefix nodejs mime-types && cp witch.js nodejs/node_modules/ && zip -r ../../witch.zip nodejs  && cd ../../
       - name: Pre-Package Function
         run: cd source/secured-headers/ && zip -r ../../s-headers.zip index.js && cd ../../
       - name: Package Release
         run: zip -r packaged.zip -@ < ci/include.lst
-      # - name: Upload Release
-      #   run: aws s3 cp packaged.zip s3://$CFN_BUCKET/amazon-cloudfront-secure-static-site/v${{ env.THIS_VERSION }}/amazon-cloudfront-secure-static-site.zip
-      #   env:
-      #     CFN_BUCKET: ${{ secrets.CFN_BUCKET }}
+      - name: Upload Release
+        run: aws s3 cp packaged.zip s3://$CFN_BUCKET/amazon-cloudfront-secure-static-site/v${{ env.THIS_VERSION }}/amazon-cloudfront-secure-static-site.zip
+        env:
+          CFN_BUCKET: ${{ secrets.CFN_BUCKET }}
diff --git a/templates/main.yaml b/templates/main.yaml
index 3a26e3f..1c02163 100644
--- a/templates/main.yaml
+++ b/templates/main.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: 2010-09-09
-Description: ACFS3 - S3 Static site with CF and ACM (uksb-1qnk6ni7b) (version:v0.4)
+Description: ACFS3 - S3 Static site with CF and ACM (uksb-1qnk6ni7b) (version:v0.5)
 
 Metadata:
   AWS::CloudFormation::Interface:
@@ -13,7 +13,7 @@ Metadata:
 Mappings:
   Solution:
     Constants:
-      Version: 'v0.4'
+      Version: 'v0.5'
 
 Parameters:
   SubDomain: