From cc6215860fb622e24a2ffa3aef33ee6cb06794cb Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 7 Mar 2026 00:54:45 +0100 Subject: [PATCH] chore(workflows): updated pushing changes to new and old branches --- .github/workflows/deploy.yml | 8 ++++---- .github/workflows/firebase-hosting-merge.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3968441..ef62bca 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,13 +11,13 @@ env: jobs: build_and_deploy: runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@v3 - name: Build the app run: yarn && yarn build - name: Setup SSH key for connection with the server run: | - mkdir -p ~/.ssh - echo "${{ secrets.VPS_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + mkdir -p ~/.ssh + echo "${{ secrets.VPS_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa - name: Send new files - run: rsync -avP -e "ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa -p 2022" ./dist/ ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }}:/var/www/$PROJECT_NAME --delete + run: rsync -avP -e "ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa -p 2022" ./dist/ ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }}:/var/www/$PROJECT_NAME --delete \ No newline at end of file diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 52a8253..f36e7d9 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -5,7 +5,7 @@ name: Deploy to Firebase Hosting on merge 'on': push: branches: - - main + - main-old jobs: build_and_deploy: runs-on: ubuntu-latest