From 1dc9da94fcb1ccb425cbb6908020257d54529a20 Mon Sep 17 00:00:00 2001 From: Andrei Dekterev Date: Tue, 29 Nov 2022 17:16:49 +0300 Subject: [PATCH] fix(#india): fix build india --- .drone.yml | 11 ++++++++--- .gitignore | 3 +++ Makefile | 50 ++++++++++++++++++++------------------------------ 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.drone.yml b/.drone.yml index c86168c5..cdd9855e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,6 +30,7 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: + - apk add --no-cache make - make prod depends_on: - npm-install @@ -57,6 +58,7 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: + - apk add --no-cache make - make auth-production-build depends_on: - npm-install @@ -95,7 +97,8 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - make india-build + - apk add --no-cache make + - make india-prod depends_on: - npm-install @@ -120,7 +123,8 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - make facr-build + - apk add --no-cache make + - make facr-prod depends_on: - npm-install @@ -145,7 +149,8 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - make lff-build + - apk add --no-cache make + - make lff-prod depends_on: - npm-install diff --git a/.gitignore b/.gitignore index 932519ba..f8d1d08e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ # production /build /build_auth +/build_india +/build_facr +/build_lff # misc .DS_Store diff --git a/Makefile b/Makefile index 52d17c36..128c4b80 100644 --- a/Makefile +++ b/Makefile @@ -120,25 +120,21 @@ auth-production-build: facr-build: clean REACT_APP_TYPE=ott \ - REACT_APP_ENV=production \ - REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ - BUILD_PATH=build_facr \ - npm run build + REACT_APP_ENV=staging \ + REACT_APP_CLIENT=facr \ + npm run build india-build: clean REACT_APP_TYPE=ott \ - REACT_APP_ENV=production \ - REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ - BUILD_PATH=build_india \ - npm run build + REACT_APP_ENV=staging \ + REACT_APP_CLIENT=india \ + npm run build lff-build: clean REACT_APP_TYPE=ott \ - REACT_APP_ENV=production \ - REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ + REACT_APP_ENV=staging \ REACT_APP_CLIENT=lff \ - BUILD_PATH=build_lff \ - npm run build + npm run build .PHONY: build @@ -149,10 +145,6 @@ prod: clean REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ npm run build && cp -r .well-known build -# rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/ -# rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/ -# rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@137.74.33.74:/usr/local/www/ott/wwwroot/ - preprod: clean REACT_APP_TYPE=ott \ REACT_APP_ENV=preproduction \ @@ -161,34 +153,32 @@ preprod: clean REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \ npm run build -india-prod: clean +india-prod: + rm -rf build_india && \ REACT_APP_TYPE=ott \ REACT_APP_ENV=production \ REACT_APP_CLIENT=india \ REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ - npm run build && cp -r .well-known build + BUILD_PATH=build_india \ + npm run build && cp -r .well-known build_india -facr-prod: clean +facr-prod: + rm -rf build_facr && \ REACT_APP_TYPE=ott \ REACT_APP_ENV=production \ REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ REACT_APP_CLIENT=facr \ - npm run build - - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/facr-wwwroot/ - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/facr-wwwroot/ - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@137.74.33.74:/usr/local/www/ott/facr-wwwroot/ + BUILD_PATH=build_facr \ + npm run build && cp -r .well-known build_facr -lff-prod: clean +lff-prod: + rm -rf build_lff && \ REACT_APP_TYPE=ott \ REACT_APP_ENV=production \ REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ REACT_APP_CLIENT=lff \ - npm run build - - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/lff-wwwroot/ - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/lff-wwwroot/ - rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@137.74.33.74:/usr/local/www/ott/lff-wwwroot/ + BUILD_PATH=build_lff \ + npm run build && cp -r .well-known build_lff deploy-all: prod preprod facr-prod lff-prod