Skip to content

Commit ededb06

Browse files
asp345asp345
authored
Merge pull request #471 from wafflestudio/release-260107
Release
2 parents 11c8ccb + 984112a commit ededb06

File tree

236 files changed

+3983
-5758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+3983
-5758
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ out/
1717
.github
1818
.dockerignore
1919

20-
.codeartifact-auth-token
20+
.codeartifact_token

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2222
aws-region: ap-northeast-2
2323

24-
- name: Set up JDK 21
24+
- name: Set up JDK 25
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: '21'
27+
java-version: '25'
2828
distribution: 'temurin'
2929

3030
- name: Run Tests
3131
run: |
32-
./gradlew clean test
32+
./gradlew clean test -x processAot -x processTestAot

‎.github/workflows/deploy-api-dev-native.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-api-dev-native
2+
3+
on:
4+
push:
5+
branches: [ develop ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-api-dev-native
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_REPOSITORY: snutt-dev/snutt-timetable
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f api/Dockerfile-native -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

‎.github/workflows/deploy-api-dev.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-api-dev
2+
3+
on:
4+
push:
5+
branches: [ develop ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-api-dev
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_REPOSITORY: snutt-dev/snutt-timetable
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f api/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

‎.github/workflows/deploy-api-prod-native.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-api-prod-native
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-api-prod-native
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_REPOSITORY: snutt-prod/snutt-timetable
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f api/Dockerfile-native -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

.github/workflows/deploy-prod.yml renamed to .github/workflows/deploy-api-prod.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
name: Deploy-prod
1+
name: Deploy-api-prod
22

33
on:
44
push:
55
branches: [ main ]
66

77
jobs:
88
deploy:
9-
name: Deploy-prod
9+
name: Deploy-api-prod
1010
runs-on: ubuntu-24.04-arm
1111
env:
1212
IMAGE_TAG: ${{ github.run_number }}
1313
BUILD_NUMBER: ${{ github.run_number }}
1414
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
1515
ECR_REPOSITORY: snutt-prod/snutt-timetable
16-
ECR_BATCH_REPOSITORY: snutt-prod/snutt-timetable-batch
1716

1817
steps:
1918
- name: Checkout
@@ -33,15 +32,13 @@ jobs:
3332
- name: Get and save Auth Token for CodeArtifact
3433
id: get-save-codeartifact-auth-token
3534
run: |
36-
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact-auth-token
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
3736
3837
- name: Docker build, tag, and push image to ECR
3938
id: build-push-image
4039
run: |
41-
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --build-arg CODEARTIFACT_AUTH_TOKEN=$(cat .codeartifact-auth-token)
42-
docker build -f Dockerfile-batch -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --build-arg CODEARTIFACT_AUTH_TOKEN=$(cat .codeartifact-auth-token)
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f api/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
4341
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
44-
docker push $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG
4542
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
4643
4744
- name: Slack Notify

.github/workflows/deploy-dev.yml renamed to .github/workflows/deploy-batch-dev-native.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
name: Deploy-dev
1+
name: Deploy-batch-dev-native
22

33
on:
44
push:
55
branches: [ develop ]
66

77
jobs:
88
deploy:
9-
name: Deploy-dev
9+
name: Deploy-batch-dev-native
1010
runs-on: ubuntu-24.04-arm
1111
env:
1212
IMAGE_TAG: ${{ github.run_number }}
1313
BUILD_NUMBER: ${{ github.run_number }}
1414
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15-
ECR_REPOSITORY: snutt-dev/snutt-timetable
1615
ECR_BATCH_REPOSITORY: snutt-dev/snutt-timetable-batch
1716

1817
steps:
@@ -33,13 +32,11 @@ jobs:
3332
- name: Get and save Auth Token for CodeArtifact
3433
id: get-save-codeartifact-auth-token
3534
run: |
36-
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact-auth-token
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
3736
3837
- name: Docker build, tag, and push image to ECR
3938
id: build-push-image
4039
run: |
41-
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . --build-arg CODEARTIFACT_AUTH_TOKEN=$(cat .codeartifact-auth-token)
42-
docker build -f Dockerfile-batch -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --build-arg CODEARTIFACT_AUTH_TOKEN=$(cat .codeartifact-auth-token)
43-
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f batch/Dockerfile-native -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
4441
docker push $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG
4542
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

‎.github/workflows/deploy-batch-dev.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-batch-dev
2+
3+
on:
4+
push:
5+
branches: [ develop ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-batch-dev
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_BATCH_REPOSITORY: snutt-dev/snutt-timetable-batch
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f batch/Dockerfile -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

‎.github/workflows/deploy-batch-prod-native.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-batch-prod-native
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-batch-prod-native
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_BATCH_REPOSITORY: snutt-prod/snutt-timetable-batch
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f batch/Dockerfile-native -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

‎.github/workflows/deploy-batch-prod.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy-batch-prod
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
jobs:
8+
deploy:
9+
name: Deploy-batch-prod
10+
runs-on: ubuntu-24.04-arm
11+
env:
12+
IMAGE_TAG: ${{ github.run_number }}
13+
BUILD_NUMBER: ${{ github.run_number }}
14+
ECR_REGISTRY: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com
15+
ECR_BATCH_REPOSITORY: snutt-prod/snutt-timetable-batch
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Configure AWS credentials
22+
uses: aws-actions/configure-aws-credentials@v4
23+
with:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26+
aws-region: ap-northeast-2
27+
28+
- name: Login to ECR
29+
id: login-ecr
30+
uses: aws-actions/amazon-ecr-login@v2
31+
32+
- name: Get and save Auth Token for CodeArtifact
33+
id: get-save-codeartifact-auth-token
34+
run: |
35+
aws codeartifact get-authorization-token --domain wafflestudio --domain-owner 405906814034 --query authorizationToken --region ap-northeast-1 --output text > .codeartifact_token
36+
37+
- name: Docker build, tag, and push image to ECR
38+
id: build-push-image
39+
run: |
40+
docker build --secret id=codeartifact_token,src=./.codeartifact_token -f batch/Dockerfile -t $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG . --platform linux/arm64
41+
docker push $ECR_REGISTRY/$ECR_BATCH_REPOSITORY:$IMAGE_TAG
42+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

0 commit comments

Comments
 (0)