Skip to content

Commit

Permalink
[Fix/#510] 액션 문재 해결 및 태스크 개선 (#511)
Browse files Browse the repository at this point in the history
* fix: 액션 문재 해결

* refactor: docs 생성 액션 개선
  • Loading branch information
belljun3395 authored Jan 8, 2025
1 parent 0d16ab8 commit e4f8989
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
- name: Generate Allure Results
run: ./gradlew test

- name: Combine Allure Results
run: ./gradlew allureReport

- name: Load test report history
uses: actions/checkout@v3
if: always()
Expand All @@ -39,7 +42,7 @@ jobs:
with:
gh_pages: gh-pages
allure_history: allure-history
allure_results: api/build/allure-results
allure_results: /allure-results

- name: Publish test report
uses: peaceiris/actions-gh-pages@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ecs-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
cache: gradle

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Deploy Amazon ECS task definition
id: ecs-deployment
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.task-definition.outputs.task-definition }}
service: ${{ env.ECS_SERVICE }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ecs-dev-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
cache: gradle

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Deploy Amazon ECS task definition
id: ecs-deployment
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.task-definition.outputs.task-definition }}
service: ${{ env.ECS_SERVICE }}
Expand Down
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,6 @@ subprojects {
useJUnitPlatform()
systemProperty("allure.results.directory", "$projectDir/build/allure-results")
}

register<Test>("architectureSpecTest") {
group = "spec"
useJUnitPlatform {
includeTags("ArchitectureSpec")
}
}
}

/** server url */
Expand Down Expand Up @@ -243,6 +236,13 @@ subprojects {
into("$projectDir/src/main/resources/static/docs/${project.name}/swagger-ui")
}

tasks.register("allureReport", Copy::class) {
group = "documentation"

from("$projectDir/build/allure-results")
into("$rootDir/allure-results")
}

defaultTasks("bootRun")
}

Expand Down

0 comments on commit e4f8989

Please sign in to comment.