[BBB-142] Build: CI/CD 수정

.github/workflows/deploy.yml

@@ -1,14 +1,16 @@
 name: Deploy to AWS ECS on Fargate
 
 on:
-  push:
+  pull_request:
     branches: [ "develop" ]
+  #    types:
+  #      - closed
   workflow_dispatch:
 
 jobs:
   deploy:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
-
     env:
       AWS_REGION: ap-northeast-2
       ECR_REPOSITORY: devs-spring-boot
@@ -20,11 +22,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Restore jar
         uses: actions/cache/restore@v4
         with:
           path: app/external-api/build/libs
-          key: ${{ runner.os }}-cached-jar-latest
+          key: ${{ runner.os }}-cached-jar-
           restore-keys: ${{ runner.os }}-cached-jar-
 
       - name: Configure AWS Credentials
@@ -40,21 +45,27 @@ jobs:
 
       - name: Build and Push Image to Amazon ECR
         uses: docker/build-push-action@v3
-        id: build-and-push-image
+        id: build-and-push
+        env:
+          ECR: ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}
         with:
+          context: .
           push: true
-          tags: ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ github.sha }}
+          provenance: false
+          tags: ${{ env.ECR }}:${{ github.sha }}
           platforms: linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha, mode=max
+          cache-from: type=registry,ref=${{ env.ECR }}:cache
+          cache-to: type=registry,ref=${{ env.ECR }}:cache,image-manifest=true
+
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def
         uses: aws-actions/amazon-ecs-render-task-definition@v1
         with:
           task-definition: ${{ env.ECS_TASK_DEFINITION }}
           container-name: ${{ env.CONTAINER_NAME }}
-          image: ${{ steps.build-and-push-image.outputs.imageid }}
+          image: ${{ fromJSON(steps.build-and-push.outputs.metadata)['image.name'] }}
+
 
       - name: Deploy Amazon ECS task definition
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1

.github/workflows/gradle.yml

@@ -1,8 +1,8 @@
 name: Java CI with Gradle and MySQL and Elasticsearch
 
 on:
-  pull_request:
-    branches: [ "develop" ]
+  #  pull_request:
+  #    branches: [ "develop" ]
   workflow_dispatch:
 
 jobs:

app/external-api/build.gradle

@@ -29,6 +29,7 @@ dependencies {
 }
 tasks.named('bootJar') {
     preserveFileTimestamps = false
+    reproducibleFileOrder = true
     enabled = true
 }
 

build.gradle

@@ -39,6 +39,8 @@ subprojects {
 
     tasks.named('jar') {
         enabled = true
+        preserveFileTimestamps = false
+        reproducibleFileOrder = true
     }
 
     tasks.named('test') {