From 162734c7a7e1b5c462390b287e70b0b9be4da75b Mon Sep 17 00:00:00 2001
From: David McDonald <david.mcdonald@digital.cabinet-office.gov.uk>
Date: Tue, 3 Mar 2020 12:05:15 +0000
Subject: [PATCH] Remove unused makefile commands

These are either not used at all or we have superseeded them with
commands written directly into concourse jobs
---
 Makefile | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 4fb07dc9e..596363ae8 100644
--- a/Makefile
+++ b/Makefile
@@ -75,22 +75,6 @@ build: dependencies generate-version-file ## Build project
 	npm run build
 	pip install -r requirements.txt
 
-.PHONY: build-paas-artifact
-build-paas-artifact: ## Build the deploy artifact for PaaS
-	rm -rf target
-	mkdir -p target
-	zip -y -q -r -x@deploy-exclude.lst target/notifications-admin.zip ./
-
-.PHONY: upload-paas-artifact ## Upload the deploy artifact for PaaS
-upload-paas-artifact:
-	$(if ${DEPLOY_BUILD_NUMBER},,$(error Must specify DEPLOY_BUILD_NUMBER))
-	$(if ${JENKINS_S3_BUCKET},,$(error Must specify JENKINS_S3_BUCKET))
-	aws s3 cp --region eu-west-1 --sse AES256 target/notifications-admin.zip s3://${JENKINS_S3_BUCKET}/build/notifications-admin/${DEPLOY_BUILD_NUMBER}.zip
-
-.PHONY: upload-static ## Upload the static files to be served from S3
-upload-static:
-	aws s3 cp --region eu-west-1 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static
-
 .PHONY: test
 test: ## Run tests
 	./scripts/run_tests.sh
@@ -187,6 +171,10 @@ generate-manifest:
 	    --format=yaml \
 	    <(${DECRYPT_CMD} ${NOTIFY_CREDENTIALS}/credentials/${CF_SPACE}/paas/environment-variables.gpg) 2>&1
 
+.PHONY: upload-static ## Upload the static files to be served from S3
+upload-static:
+	aws s3 cp --region eu-west-1 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static
+
 .PHONY: cf-deploy
 cf-deploy: ## Deploys the app to Cloud Foundry
 	$(if ${CF_SPACE},,$(error Must specify CF_SPACE))
@@ -209,10 +197,6 @@ cf-deploy-prototype-2: cf-target ## Deploys the second prototype to Cloud Foundr
 cf-rollback: cf-target ## Rollbacks the app to the previous release
 	cf v3-cancel-zdt-push ${CF_APP}
 
-.PHONY: cf-push
-cf-push:
-	cf push -f <(make -s generate-manifest)
-
 .PHONY: cf-target
 cf-target: check-env-vars
 	@cf target -o ${CF_ORG} -s ${CF_SPACE}