[fix] gradle.yml

Kusitms-Hackathon-C · Oct 6, 2023 · 99744aa · 99744aa
1 parent 42125da
commit 99744aa
Showing 1 changed file with 41 additions and 43 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,57 +9,55 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: 
+      - develop
   pull_request:
-    branches: [ "develop" ]
+    branches: 
+      - develop
 
 permissions:
   contents: read
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-
-    ## gradle build
-    - name: Build with Gradle
-      run: ./gradlew bootJar
-
-    ## 웹 이미지 빌드 및 도커허브에 push
-    - name: web docker build and push
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-        docker build -t ${{ secrets.DOCKER_REPO }}/blue-green .
-        docker push ${{ secrets.DOCKER_REPO }}/blue-green
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
 
-    ## deploy.sh 파일 서버로 전달하기(복사 후 붙여넣기)
-    - name: Send deploy.sh
-      uses: appleboy/scp-action@master
-      with:
-        username: ubuntu
-        host: ${{ secrets.HOST }}
-        key: ${{ secrets.KEY }}
-        port: 22
-        source: "./deploy.sh"
-        target: "/home/ubuntu/"
+      - name: Build with Gradle
+        run: ./gradlew bootJar
 
-    ## 도커 허브에서 jar파일 및 pull후에 컴포즈 up
-    - name: Deploy to Dev
-      uses: appleboy/ssh-action@master
-      with:
-        username: ubuntu
-        host: ${{ secrets.HOST }}
-        key: ${{ secrets.KEY }}
-        script: |
-          sudo docker pull ${{ secrets.DOCKER_REPO }}/blue-green
-          chmod 777 ./deploy.sh
-          ./deploy.sh
-          docker image prune -f
+      - name: web docker build and push
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }}/blue-green .
+          docker push ${{ secrets.DOCKER_REPO }}/blue-green
+
+      - name: Send deploy.sh
+        uses: appleboy/scp-action@master
+        with:
+          username: ubuntu
+          host: ${{ secrets.HOST }}
+          key: ${{ secrets.KEY }}
+          port: 22
+          source: "./deploy.sh"
+          target: "/home/ubuntu/"
+
+      - name: Deploy to Dev
+        uses: appleboy/ssh-action@master
+        with:
+          username: ubuntu
+          host: ${{ secrets.HOST }}
+          key: ${{ secrets.KEY }}
+          script: |
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/blue-green
+            chmod 777 ./deploy.sh
+            ./deploy.sh
+            docker image prune -f
+