From 436c3ec8fb8868817f91faf3fcfe5667c7cd25e8 Mon Sep 17 00:00:00 2001 From: Austin Flores Date: Tue, 18 Mar 2025 12:07:59 +0100 Subject: [PATCH 1/2] Testing a build via github --- .github/workflows/deploy.yml | 18 ++++++++++++++---- frontend/vite.config.ts | 18 +++++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c81602c..43a683d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,6 +23,13 @@ jobs: chmod 600 ~/.ssh/id_rsa ssh-keyscan -H ${{ env.DOMAIN }} >> ~/.ssh/known_hosts + - name: Build Frontend + run: | + pushd frontend + npm install --ci + npm run build + popd + - name: Put Site in Maintenance Mode run: | ssh deployer@${{ env.DOMAIN }} << 'EOF' @@ -30,7 +37,7 @@ jobs: sudo systemctl restart nginx EOF - - name: Deploy Application + - name: Deploy Backend and dependencies run: | ssh deployer@165.232.69.153 << 'EOF' cd ${{ env.DEPLOY_PATH }} @@ -39,8 +46,7 @@ jobs: # build frontend pushd frontend - npm install - npm run build + npm install --ci popd # build symfony @@ -60,7 +66,11 @@ jobs: sudo systemctl restart php8.3-fpm EOF - + - name: Deploy Frontend + run: | + scp -r frontend/dist/assets deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/assets + scp -r frontend/dist/index.html deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/index.html + scp -r frontend/dist/favicon.ico deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/favicon.ico - name: Bring Site Back Online run: | ssh deployer@${{ env.DOMAIN }} << 'EOF' diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index bb885b5..1a1f2c7 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -6,13 +6,13 @@ import vueDevTools from "vite-plugin-vue-devtools"; // https://vite.dev/config/ export default defineConfig({ - plugins: [vue(), vueDevTools()], - build: { - outDir: "../public", - }, - resolve: { - alias: { - "@": fileURLToPath(new URL("./src", import.meta.url)), - }, - }, + plugins: [vue(), vueDevTools()], + build: { + outDir: "./dist", + }, + resolve: { + alias: { + "@": fileURLToPath(new URL("./src", import.meta.url)), + }, + }, }); From 081f74b002a1749c6314c27a83c60a966d097027 Mon Sep 17 00:00:00 2001 From: Austin Flores Date: Tue, 18 Mar 2025 12:10:04 +0100 Subject: [PATCH 2/2] Change order to ensure that permissions are set correctly --- .github/workflows/deploy.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 43a683d..52a660c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,6 +37,12 @@ jobs: sudo systemctl restart nginx EOF + - name: Deploy Frontend + run: | + scp -r frontend/dist/assets deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/assets + scp -r frontend/dist/index.html deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/index.html + scp -r frontend/dist/favicon.ico deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/favicon.ico + - name: Deploy Backend and dependencies run: | ssh deployer@165.232.69.153 << 'EOF' @@ -66,11 +72,6 @@ jobs: sudo systemctl restart php8.3-fpm EOF - - name: Deploy Frontend - run: | - scp -r frontend/dist/assets deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/assets - scp -r frontend/dist/index.html deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/index.html - scp -r frontend/dist/favicon.ico deployer@${{ env.DOMAIN }}:${{ env.DEPLOY_PATH }}/public/favicon.ico - name: Bring Site Back Online run: | ssh deployer@${{ env.DOMAIN }} << 'EOF'