From 4b7e0f2c323f5726cb1ceec26d37351ae08610b2 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Fri, 21 Jun 2024 17:58:27 +0100 Subject: [PATCH 1/2] Remove deploy.zip --- src/README.md | 1 - src/tools/scripts/deploy.sh | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/README.md b/src/README.md index 7753b037bc4..06d8243ed19 100644 --- a/src/README.md +++ b/src/README.md @@ -376,7 +376,6 @@ The deploy script will do the following: - Ask you to complete any local tests and confirm good to deploy - Ask for a version number (suggesing the last verision tagged and incrementing the patch) - Tag the release (after asking you for the version number to use) -- Generate a `deploy.zip` file of what has been deployed - Deploy to GCP - Push changes to `production` branch on GitHub - Switch you back to the `main` branch. diff --git a/src/tools/scripts/deploy.sh b/src/tools/scripts/deploy.sh index 4d3610a4369..9a532f6ac7b 100755 --- a/src/tools/scripts/deploy.sh +++ b/src/tools/scripts/deploy.sh @@ -167,15 +167,6 @@ LONG_DATE=$(date -u +%Y-%m-%d\ %H:%M:%S) git tag -a "${TAG_VERSION}" -m "Version ${TAG_VERSION} ${LONG_DATE}" echo "Tagged ${TAG_VERSION} with message 'Version ${TAG_VERSION} ${LONG_DATE}'" -if [[ -f deployed.zip ]]; then - echo "Removing old deploy.zip" - rm -f deployed.zip -fi - -echo "Zipping artifacts into deploy.zip" -# Exclude chapter images as quite large and tracked in git anyway -zip -q -r deployed . --exclude @.gcloudignore static/images/*/*/* static/pdfs/* - echo "Deploying to GCP" echo "Y" | gcloud app deploy --project webalmanac --stop-previous-version @@ -207,7 +198,6 @@ echo -e "${GREEN}Successfully deployed!${RESET_COLOR}" echo echo -e "${AMBER}Please update release on GitHub: https://github.com/HTTPArchive/almanac.httparchive.org/releases${RESET_COLOR}" echo -e "${AMBER}Using tag ${TAG_VERSION}@production${RESET_COLOR}" -echo -e "${AMBER}Please upload deploy.zip as the release artifact${RESET_COLOR}" echo echo "Have a good one!" echo From d77fee8d96decae60c3337d0f13b7bd01c4f95dc Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Fri, 21 Jun 2024 17:59:34 +0100 Subject: [PATCH 2/2] Remove from ignore files --- src/.gcloudignore | 1 - src/.gitignore | 1 - 2 files changed, 2 deletions(-) diff --git a/src/.gcloudignore b/src/.gcloudignore index 16813fd4fb2..bfc528f8271 100644 --- a/src/.gcloudignore +++ b/src/.gcloudignore @@ -43,5 +43,4 @@ static/pdfs/* **/.DS_Store Dockerfile .dockerignore -deployed.zip .coverage diff --git a/src/.gitignore b/src/.gitignore index 939a0fa4207..724746219b5 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -8,5 +8,4 @@ templates/*/rss.xml templates/sitemap.xml static/html/ static/js/web-vitals.js -deployed.zip .coverage