diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index 4fccdfb8..316c79e6 100644 --- 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 \ No newline at end of file + run: ./gradlew clean build \ No newline at end of file diff --git a/.github/workflows/springboot-on-pr.yaml b/.github/workflows/springboot-on-pr.yaml index 737aa350..351b6171 100644 --- 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 index 7636f044..a0a5c7c9 100644 --- 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 &"