build all branches (but only deploy main)

.github/workflows/deploy.yml

@@ -9,13 +9,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Hugo
+      - name: Set up Hugo
         uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: "0.122.0"
           extended: true
 
-      - name: Set up ruby 3.2.1
+      - name: Set up Ruby 3.2.1
         uses: ruby/setup-ruby@v1
         env:
           BUNDLE_GEMFILE: ${{ github.workspace }}/bin/dither/Gemfile
@@ -35,6 +35,13 @@ jobs:
           KEY: ${{ github.workspace }}/secret.key
         run: cd bin/dither && bundle exec ruby dither.rb >> dither.log 2>&1 &
 
+      - name: Generate static site
+        env:
+          DITHER_SERVER: http://localhost:4567
+        run: |
+          source bin/get-last-commit.sh
+          hugo
+
       - name: Install SSH deploy key
         if: ${{ github.ref == 'refs/heads/main' }}
         env:
@@ -51,5 +58,11 @@ jobs:
         if: ${{ github.ref == 'refs/heads/main' }}
         env:
           SERVER_IP: ${{ secrets.SERVER_IP }}
-          DITHER_SERVER: http://localhost:4567
-        run: bin/deploy
+        run: |
+          rsync \
+            -v \
+            -r \
+            --delete \
+            -e "ssh -o PubkeyAcceptedKeyTypes=+ssh-rsa" \
+            public/* \
+            www-data@$SERVER_IP:/var/www/davideisinger.com

content/journal/encrypt-and-dither-photos-in-hugo/index.md

@@ -192,7 +192,7 @@ This site uses GitHub Actions to deploy on pushes to the `main` branch, and we n
 
 [Here's the deploy workflow for this site][18] for reference.
 
-[18]: https://github.com/dce/davideisinger.com/blob/7285c58add56e2ac6b5f7bf62914f0615ac23c9f/.github/workflows/deploy.yml
+[18]: https://github.com/dce/davideisinger.com/blob/901c8baad1f60a65910b387b20c8bcd0ea402c0b/.github/workflows/deploy.yml
 
 ***