Update deploy job actions

epistrephein · Jan 4, 2024 · 790b93c · 790b93c
1 parent fd7574e
commit 790b93c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,29 +9,31 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-    - name: Run RSpec
-      run: bundle exec rake spec
-    - name: Run RuboCop
-      run: bundle exec rake rubocop
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run RSpec
+        run: bundle exec rake spec
+      - name: Run RuboCop
+        run: bundle exec rake rubocop
   deploy:
     runs-on: ubuntu-latest
     needs: build
     steps:
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_PRIVATE_KEY }}
-        known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-    - name: Connect and update
-      run: |
-        ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} -p${{ secrets.SSH_PORT }} \
-          "cd ${{ secrets.SSH_WORKING_DIR }} && \
-           git pull && \
-           bundle install && \
-           sudo systemctl restart rubies"
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+      - name: Connect and update
+        run: |
+          ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} -p${{ secrets.SSH_PORT }} \
+            "cd ${{ secrets.SSH_WORKING_DIR }} && \
+            git fetch --prune && \
+            git reset --hard @{upstream} && \
+            git clean -d --force && \
+            bundle install && \
+            sudo systemctl restart rubies"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -6,13 +6,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-    - name: Run RSpec
-      run: bundle exec rake spec
-    - name: Run RuboCop
-      run: bundle exec rake rubocop
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run RSpec
+        run: bundle exec rake spec
+      - name: Run RuboCop
+        run: bundle exec rake rubocop