diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 2dc91c0..28836af 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,41 +1,3 @@ -# name: Deploy site -# on: -# push: -# branches: [main] - -# jobs: -# deploy: -# runs-on: ubuntu-latest -# container: node:18 -# steps: -# - uses: actions/checkout@v3 -# - run: npm install -# - run: npm run build:posts -# - run: npm run build -# - run: | -# cp -r dist/* /var/www/systemsobscure.blog/ -# chown -R www-data:www-data /var/www/systemsobscure.blog/ -# - -# name: Deploy Blog -# on: -# push: -# branches: [main] - -# jobs: -# deploy: -# runs-on: ubuntu-latest -# container: -# image: node:18 -# volumes: -# - /var/www:/var/www -# steps: -# - uses: actions/checkout@v3 -# - run: npm install -# - run: npm run build:posts -# - run: npm run build -# - run: cp -r dist/* /var/www/systemsobscure.blog/ - name: Deploy Blog on: push: @@ -44,18 +6,36 @@ on: jobs: deploy: runs-on: ubuntu-latest - container: node:18 + container: + image: node:18 + volumes: + - /var/www/systemsobscure.blog:/output steps: - uses: actions/checkout@v3 - - run: npm install - run: npm run build:posts - run: npm run build - - - name: Deploy via SSH + - name: Deploy files run: | - echo "${{ secrets.SSH_PRIVATE_KEY }}" > /tmp/ssh_key - chmod 600 /tmp/ssh_key - ssh -i /tmp/ssh_key -o StrictHostKeyChecking=no thomas@localhost "rm -rf /var/www/systemsobscure.blog/*" - scp -i /tmp/ssh_key -o StrictHostKeyChecking=no -r dist/* thomas@localhost:/var/www/systemsobscure.blog/ - rm /tmp/ssh_key + rm -rf /output/* + cp -r dist/* /output/ + +# jobs: +# deploy: +# runs-on: ubuntu-latest +# container: node:18 +# steps: +# - uses: actions/checkout@v3 + +# - run: npm install +# - run: npm run build:posts +# - run: npm run build + +# - name: Deploy via SSH +# run: | +# echo "${{ secrets.SSH_PRIVATE_KEY }}" > /tmp/ssh_key +# chmod 600 /tmp/ssh_key +# ssh -i /tmp/ssh_key -o StrictHostKeyChecking=no thomas@localhost "rm -rf /var/www/systemsobscure.blog/*" +# scp -i /tmp/ssh_key -o StrictHostKeyChecking=no -r dist/* thomas@localhost:/var/www/systemsobscure.blog/ +# rm /tmp/ssh_key +