Skip to content

Commit e53c438

Browse files
committed
Merge branch 'feature/ming0213' of github.com:Ming0213/mega into feature/ming0213
2 parents a501bd6 + b7d90b6 commit e53c438

60 files changed

Lines changed: 549 additions & 96 deletions

Some content is hidden

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

.github/workflows/web-deploy.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
web-ui-deploy:
21+
build:
2222
runs-on: ubuntu-latest
23+
strategy:
24+
matrix:
25+
env_name: [staging, staging-nju]
2326
timeout-minutes: 10
2427
steps:
2528
- name: Checkout repository
@@ -44,26 +47,30 @@ jobs:
4447
with:
4548
registry-type: public
4649

47-
- name: Build, tag, and push docker image to Amazon ECR Public
50+
- name: Build, tag, and push docker image (${{ matrix.env_name }}) to Amazon ECR Public
4851
working-directory: moon
4952
env:
5053
REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
5154
REGISTRY_ALIAS: m8q5m4u3
52-
REPOSITORY: mega-ui
53-
IMAGE_TAG: mega-ui-0.1.0-pre-release
55+
REPOSITORY: mega
56+
IMAGE_TAG: mega-ui-${{ matrix.env_name }}-0.1.0-pre-release
5457
run: |
5558
docker build \
59+
--build-arg APP_ENV=${{ matrix.env_name }} \
5660
-f apps/web/Dockerfile \
5761
-t $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$IMAGE_TAG .
5862
docker push $REGISTRY/$REGISTRY_ALIAS/$REPOSITORY:$IMAGE_TAG
59-
60-
- name: Force ECS redeploy
61-
run: |
62-
aws ecs update-service \
63-
--cluster ${{ secrets.AWS_ECS_CLUSTER_NAME }} \
64-
--service ${{ secrets.AWS_ECS_WEB_SERVICE_NAME }} \
65-
--force-new-deployment
66-
env:
67-
AWS_REGION: ap-southeast-2
68-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
69-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
63+
deploy:
64+
needs: build
65+
runs-on: ubuntu-latest
66+
steps:
67+
- name: Force ECS redeploy
68+
run: |
69+
aws ecs update-service \
70+
--cluster ${{ secrets.AWS_ECS_CLUSTER_NAME }} \
71+
--service ${{ secrets.AWS_ECS_WEB_SERVICE_NAME }} \
72+
--force-new-deployment
73+
env:
74+
AWS_REGION: ap-southeast-2
75+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
76+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

jupiter/callisto/src/access_token.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/builds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_blob.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_commit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_issue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_pr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_repo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_tag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

jupiter/callisto/src/git_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
1+
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.14
22
33
use sea_orm::entity::prelude::*;
44
use serde::{Deserialize, Serialize};

0 commit comments

Comments
 (0)