From b239f535ee90171d8f1cd634e7e389f31385c95c Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 12:55:38 +0530
Subject: [PATCH 01/16] variables used in deploy script

---
 .scripts/deploy.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index cb92fbe292..ec54b5b17b 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -5,9 +5,11 @@ npm install -g surge
 echo "REF value is ${REF}"
 
 PR_NUMBER="$(echo $REF | cut -d'/' -f3)"
+PROJECT_BUILD="./public"
+DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
 
 
-surge --project "./public" --domain "pr-${PR_NUMBER}-numpy.org-newsite.surge.sh";
+surge --project PROJECT_BUILD --domain DOMAIN;
 
-echo ::set-output name=deployed-domain::"pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
+echo ::set-output name=deployed-domain::DOMAIN

From 3c6ba53ffbcb37d5c221ec9261d5c1a96621bb0e Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 12:58:52 +0530
Subject: [PATCH 02/16] minor change

---
 .scripts/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index ec54b5b17b..d9376eb249 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -10,6 +10,6 @@ DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
 
 
-surge --project PROJECT_BUILD --domain DOMAIN;
+surge --project $PROJECT_BUILD --domain $DOMAIN;
 
 echo ::set-output name=deployed-domain::DOMAIN

From 0aaab187b091c02dbbf4f1dde67b14a28694d746 Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:03:08 +0530
Subject: [PATCH 03/16] minor change - checking the current directory it is
 looking for project build

---
 .scripts/deploy.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index d9376eb249..5cb0e2ea63 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -8,8 +8,9 @@ PR_NUMBER="$(echo $REF | cut -d'/' -f3)"
 PROJECT_BUILD="./public"
 DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
-
+pwd
+ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;
 
-echo ::set-output name=deployed-domain::DOMAIN
+echo ::set-output name=deployed-domain::$DOMAIN

From ba22dbd007f444db4feb38a773256c5d62150085 Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:05:20 +0530
Subject: [PATCH 04/16] minor change - checking the current directory it is
 looking for project build

---
 .scripts/deploy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index 5cb0e2ea63..b9359d9130 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -9,6 +9,7 @@ PROJECT_BUILD="./public"
 DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
 pwd
+ls
 ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;

From 5a1091e73d13b50317f7f28dda8c40ae39090b69 Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:09:42 +0530
Subject: [PATCH 05/16] minor change - checking the current directory it is
 looking for project build

---
 .scripts/build.sh | 1 +
 Dockerfile        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.scripts/build.sh b/.scripts/build.sh
index 561da445a9..0282e4cde5 100644
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 hugo
+ls
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8ef90c97b0..5a7aa3921d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN .scripts/install.sh
 RUN .scripts/build.sh
 
 RUN echo ${REF}
-RUN echo "$REF"
+
 RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
 
 ENTRYPOINT .scripts/deploy.sh; /bin/bash

From 9f3a4b50fd6e44e990a76567051e7e35224e6fb2 Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:14:33 +0530
Subject: [PATCH 06/16] running the deploy script

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a7aa3921d..30ce497eac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,6 @@ RUN chmod +x .scripts/deploy.sh
 RUN .scripts/install.sh
 RUN .scripts/build.sh
 
-RUN echo ${REF}
-
 RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
 
-ENTRYPOINT .scripts/deploy.sh; /bin/bash
+RUN .scripts/deploy.sh

From 0025546d2701a1f67a2ca9ef72fcb2cb6127eeab Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:14:45 +0530
Subject: [PATCH 07/16] minor change

---
 .scripts/deploy.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index b9359d9130..4b4712cc07 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -8,9 +8,7 @@ PR_NUMBER="$(echo $REF | cut -d'/' -f3)"
 PROJECT_BUILD="./public"
 DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
-pwd
 ls
-ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;
 

From 5f4a00e39fda283853c82ecb2a3ff03c43583b2d Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:21:14 +0530
Subject: [PATCH 08/16] verify the surge login and surge token

---
 .scripts/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index 4b4712cc07..e7ebf5cbc3 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -8,8 +8,8 @@ PR_NUMBER="$(echo $REF | cut -d'/' -f3)"
 PROJECT_BUILD="./public"
 DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
+echo "SURGE_LOGIN: $SURGE_LOGIN"
+echo "SURGE_TOKEN: $SURGE_TOKEN"
 ls
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;
-
-echo ::set-output name=deployed-domain::$DOMAIN

From d5a3045526075d28ae58e7250f082be06f78ce6e Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:24:29 +0530
Subject: [PATCH 09/16] minor change

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 30ce497eac..2b39bacef9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ RUN .scripts/build.sh
 
 RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
 
-RUN .scripts/deploy.sh
+ENTRYPOINT .scripts/deploy.sh; /bin/bash

From 08a70354be7e2fe1c0d85dbd6255c41fe06d7aad Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:29:55 +0530
Subject: [PATCH 10/16] minor change- put build script in entry point only

minor change- put build script in entry point only
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b39bacef9..a7c2068d11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,8 +11,8 @@ RUN chmod +x .scripts/build.sh
 RUN chmod +x .scripts/deploy.sh
 
 RUN .scripts/install.sh
-RUN .scripts/build.sh
 
 RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
 
-ENTRYPOINT .scripts/deploy.sh; /bin/bash
+CMD sh .scripts/build.sh
+CMD sh .scripts/deploy.sh

From 16cbcff81051d21b3c17c96fd540349d436e429d Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sat, 19 Oct 2019 13:54:19 +0530
Subject: [PATCH 11/16] minor change- call build from deploy script

---
 .scripts/build.sh   | 5 +++--
 .scripts/deploy.sh  | 7 +++++++
 .scripts/install.sh | 2 +-
 Dockerfile          | 7 ++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.scripts/build.sh b/.scripts/build.sh
index 0282e4cde5..9ccf810d95 100644
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-hugo
-ls
\ No newline at end of file
+sudo hugo
+ls
+
diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index e7ebf5cbc3..5615a71717 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Should be moved to build.sh
+# NOTE: Running build.sh and then deploy.sh is not finding the public
+# folder which is generated after the build command (hugo).
+hugo
+
 npm install -g surge
 
 echo "REF value is ${REF}"
@@ -11,5 +16,7 @@ echo "PR_NUMBER: $PR_NUMBER"
 echo "SURGE_LOGIN: $SURGE_LOGIN"
 echo "SURGE_TOKEN: $SURGE_TOKEN"
 ls
+ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;
+
diff --git a/.scripts/install.sh b/.scripts/install.sh
index 94f7db4fc0..a72ef429c7 100644
--- a/.scripts/install.sh
+++ b/.scripts/install.sh
@@ -18,4 +18,4 @@ location="$(which hugo)"
 echo "Hugo binary location: $location"
 
 version="$(hugo version)"
-echo "Hugo binary version: $version"
\ No newline at end of file
+echo "Hugo binary version: $version"
diff --git a/Dockerfile b/Dockerfile
index a7c2068d11..d346eff6e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,8 @@ FROM node:10-alpine
 ADD . ./app
 WORKDIR /app
 
+RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
+
 RUN apk add --no-cache curl
 RUN apk add --no-cache wget
 RUN apk add --no-cache bash
@@ -12,7 +14,6 @@ RUN chmod +x .scripts/deploy.sh
 
 RUN .scripts/install.sh
 
-RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
+ENTRYPOINT .scripts/deploy.sh; /bin/bash
+
 
-CMD sh .scripts/build.sh
-CMD sh .scripts/deploy.sh

From 7c9566f32a84348fc52580eb061d0620dca26015 Mon Sep 17 00:00:00 2001
From: Joe LaChance <jlachance1@gmail.com>
Date: Sat, 19 Oct 2019 23:05:53 -0500
Subject: [PATCH 12/16] adds submodule command to build.sh

---
 .scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.scripts/build.sh b/.scripts/build.sh
index 9ccf810d95..fcbd28b461 100644
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+git submodule update --init
 sudo hugo
 ls
 

From 6ee14c12509980603dd11b7910d1989efdf90cab Mon Sep 17 00:00:00 2001
From: Joe LaChance <jlachance1@gmail.com>
Date: Sat, 19 Oct 2019 23:21:53 -0500
Subject: [PATCH 13/16] adds submodules to deploy.sh

---
 .scripts/deploy.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index 5615a71717..32a58fba8c 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -3,6 +3,7 @@
 # Should be moved to build.sh
 # NOTE: Running build.sh and then deploy.sh is not finding the public
 # folder which is generated after the build command (hugo).
+git submodule update --init
 hugo
 
 npm install -g surge
@@ -16,6 +17,7 @@ echo "PR_NUMBER: $PR_NUMBER"
 echo "SURGE_LOGIN: $SURGE_LOGIN"
 echo "SURGE_TOKEN: $SURGE_TOKEN"
 ls
+echo "---"
 ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;

From 431c52b18beb401ab7fc3a8f3b564c55130789c1 Mon Sep 17 00:00:00 2001
From: Joe LaChance <jlachance1@gmail.com>
Date: Sat, 19 Oct 2019 23:26:38 -0500
Subject: [PATCH 14/16] adds git to Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index d346eff6e8..52e00db0fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ RUN export PR_NUMBER=$(echo ${REF} | cut -d'/' -f3)
 RUN apk add --no-cache curl
 RUN apk add --no-cache wget
 RUN apk add --no-cache bash
+RUN apk add --no-cache git
 
 RUN chmod +x .scripts/install.sh
 RUN chmod +x .scripts/build.sh

From 2bd3acc6ce04d0bc69b75f25284501d01980071f Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sun, 20 Oct 2019 13:39:34 +0530
Subject: [PATCH 15/16] comment added in build.sh - unused file for now

---
 .scripts/build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.scripts/build.sh b/.scripts/build.sh
index 9ccf810d95..1d330fa1cb 100644
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Note: This script file is not called. It is shfited to the deploy.sh
+# Refer: https://github.com/numpy/numpy.org/pull/58/files#r336767432
 sudo hugo
 ls
 

From 81fd6a3b381830b1e4e4f7e3d45f52dae50bb29d Mon Sep 17 00:00:00 2001
From: shekharrajak <shekharstudy@ymail.com>
Date: Sun, 20 Oct 2019 13:42:08 +0530
Subject: [PATCH 16/16] minor changes in deploy.sh - unused code removed and
 comment added

---
 .scripts/deploy.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
index 32a58fba8c..fd96be1a18 100755
--- a/.scripts/deploy.sh
+++ b/.scripts/deploy.sh
@@ -6,6 +6,7 @@
 git submodule update --init
 hugo
 
+# deploy in surge
 npm install -g surge
 
 echo "REF value is ${REF}"
@@ -16,8 +17,6 @@ DOMAIN="pr-${PR_NUMBER}-numpy.org-newsite.surge.sh"
 echo "PR_NUMBER: $PR_NUMBER"
 echo "SURGE_LOGIN: $SURGE_LOGIN"
 echo "SURGE_TOKEN: $SURGE_TOKEN"
-ls
-echo "---"
 ls "./public"
 
 surge --project $PROJECT_BUILD --domain $DOMAIN;