From bab0976085e65806b80cd40a3cbfa984871fc866 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Thu, 11 May 2023 11:02:01 -0400 Subject: [PATCH 1/6] Update astro.yml --- .github/workflows/astro.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index dbd0f56..814840c 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -76,19 +76,22 @@ jobs: --site "${{ steps.pages.outputs.origin }}" \ working-directory: ${{ env.BUILD_PATH }} - - name: Upload artifact - uses: actions/upload-pages-artifact@v1 - with: - path: ${{ env.BUILD_PATH }}/dist +# - name: Upload artifact +# uses: actions/upload-pages-artifact@v1 +# with: +# path: ${{ env.BUILD_PATH }}/dist deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} needs: build runs-on: ubuntu-latest name: Deploy steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2 + - name: Install SSH key + uses: shimataro/ssh-key-action@6f350ca8484d8d55c2e361e74d17e638dabe713a + with: + key: ${{ secrets.SSH_KEY }} + known_hosts: ${{ secrets.KNOWN_HOSTS }} + - name: Copy files to VM + run: rsync -chav --delete ${{ env.BUILD_PATH }} ${{ secrets.USER_AND_IP }}:/var/www/HenryHiles/tmp + - name: Execute remote command + run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh www.henryhiles.com HenryHiles 5137 From 39303c108428aee3501c5641450fa44288651108 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 12 May 2023 10:07:51 -0400 Subject: [PATCH 2/6] Update astro.yml --- .github/workflows/astro.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index 814840c..1eb9ccf 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -2,7 +2,7 @@ # # To get started with Astro see: https://docs.astro.build/en/getting-started/ # -name: Deploy Astro site to Pages +name: Deploy Astro site to VM on: # Runs on pushes targeting the default branch @@ -75,11 +75,6 @@ jobs: pnpx astro build \ --site "${{ steps.pages.outputs.origin }}" \ working-directory: ${{ env.BUILD_PATH }} - -# - name: Upload artifact -# uses: actions/upload-pages-artifact@v1 -# with: -# path: ${{ env.BUILD_PATH }}/dist deploy: needs: build From 43381cade9195465c7c89bee9dc23df5041be69b Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 12 May 2023 10:09:57 -0400 Subject: [PATCH 3/6] Update astro.yml --- .github/workflows/astro.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index 1eb9ccf..cf8bd3f 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -12,12 +12,6 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. concurrency: @@ -75,12 +69,6 @@ jobs: pnpx astro build \ --site "${{ steps.pages.outputs.origin }}" \ working-directory: ${{ env.BUILD_PATH }} - - deploy: - needs: build - runs-on: ubuntu-latest - name: Deploy - steps: - name: Install SSH key uses: shimataro/ssh-key-action@6f350ca8484d8d55c2e361e74d17e638dabe713a with: From 5b8ae2655336265faf9869db5fac93cc6ee4379a Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 12 May 2023 10:23:03 -0400 Subject: [PATCH 4/6] Update astro.yml --- .github/workflows/astro.yml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index cf8bd3f..231e990 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -1,26 +1,17 @@ -# Sample workflow for building and deploying an Astro site to GitHub Pages -# -# To get started with Astro see: https://docs.astro.build/en/getting-started/ -# name: Deploy Astro site to VM on: - # Runs on pushes targeting the default branch push: branches: ["main"] - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. + concurrency: group: "pages" cancel-in-progress: false env: - BUILD_PATH: "." # default value when not using subfolders - # BUILD_PATH: subfolder + BUILD_PATH: "." jobs: build: @@ -55,10 +46,6 @@ jobs: key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm-store- - - - name: Setup Pages - id: pages - uses: actions/configure-pages@v3 - name: Install dependencies run: pnpm install --frozen-lockfile @@ -69,12 +56,15 @@ jobs: pnpx astro build \ --site "${{ steps.pages.outputs.origin }}" \ working-directory: ${{ env.BUILD_PATH }} + - name: Install SSH key uses: shimataro/ssh-key-action@6f350ca8484d8d55c2e361e74d17e638dabe713a with: key: ${{ secrets.SSH_KEY }} known_hosts: ${{ secrets.KNOWN_HOSTS }} + - name: Copy files to VM - run: rsync -chav --delete ${{ env.BUILD_PATH }} ${{ secrets.USER_AND_IP }}:/var/www/HenryHiles/tmp + run: rsync -chav --delete ${{ env.BUILD_PATH }} ${{ secrets.USER_AND_IP }}:/var/www/HenryHiles/tmp + - name: Execute remote command run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh www.henryhiles.com HenryHiles 5137 From a6adaa0e0404f9a476b07234e5da54a7b8a63b86 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 12 May 2023 11:13:32 -0400 Subject: [PATCH 5/6] Update astro.yml --- .github/workflows/astro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index 231e990..2cbfa72 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -67,4 +67,4 @@ jobs: run: rsync -chav --delete ${{ env.BUILD_PATH }} ${{ secrets.USER_AND_IP }}:/var/www/HenryHiles/tmp - name: Execute remote command - run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh www.henryhiles.com HenryHiles 5137 + run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh www.henryhiles.com HenryHiles From e1cc77a7841c82a3d96c4a673a9545b8eafb9dc3 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 12 May 2023 11:44:37 -0400 Subject: [PATCH 6/6] Testing --- .github/workflows/astro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index 2cbfa72..05fd04e 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -67,4 +67,4 @@ jobs: run: rsync -chav --delete ${{ env.BUILD_PATH }} ${{ secrets.USER_AND_IP }}:/var/www/HenryHiles/tmp - name: Execute remote command - run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh www.henryhiles.com HenryHiles + run: ssh ${{ secrets.USER_AND_IP }} sudo /var/www/deploy-astro.sh astro.henryhiles.com HenryHilesAstro