refactor: remove duplicate gradle test

fix: fix nohub continuous deployment script
snuhcs-course · Nov 28, 2023 · 5636f13 · 5636f13
1 parent 3226e78
commit 5636f13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -29,6 +29,4 @@ jobs:
     - name: Add API_BASE_URL to local.properties
       run: echo "API_BASE_URL= \"${{ secrets.API_BASE_URL }}\"" >> local.properties
     - name: Build with Gradle
-      run: ./gradlew clean build
-    - name: Test with Gradle
-      run: ./gradlew test
+      run: ./gradlew clean build
diff --git a/.github/workflows/springboot-on-pr.yaml b/.github/workflows/springboot-on-pr.yaml
@@ -26,5 +26,3 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew clean build
-    - name: Test with Gradle
-      run: ./gradlew test
diff --git a/.github/workflows/springboot-on-push.yaml b/.github/workflows/springboot-on-push.yaml
@@ -30,8 +30,6 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew clean build
-    - name: Test with Gradle
-      run: ./gradlew test
 
     # Setup SSH
     - name: Set up SSH agent with private key
@@ -52,7 +50,7 @@ jobs:
     - name: Execute remote commands
       run: |
         ssh -v ${{ secrets.SPRINGBOOT_USERNAME }}@${{ secrets.SPRINGBOOT_HOST_DNS }} \
-        "sudo lsof -t -i tcp:8080 | sargs sudo kill -9 || true && \
-        cd ${{ secrets.SPRINGBOOT_ROOT_DIR }} && pwd && \
-        sudo nohup /usr/bin/java -jar ${{ secrets.SPRINGBOOT_TARGET_DIR }}/*.jar \
+        "kill $(pgrep -f springboot-0.0.1-SNAPSHOT.jar) || true && \
+        cd ${{ secrets.SPRINGBOOT_ROOT_DIR }} && \
+        sudo nohup /usr/bin/java -jar ${{ secrets.SPRINGBOOT_TARGET_DIR }}/*.jar & \
         > ${{ secrets.SPRINGBOOT_ROOT_DIR }}/app.log 2>&1 &"