From ed56813c728a154dc5f16d0ac51247e2c3ff34ad Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 29 Mar 2024 16:50:31 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20prod-kr=EC=9D=84=20=EC=9E=84=EC=8B=9C?= =?UTF-8?q?=EC=9D=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ".github/workflows/\bprod-kr.yml" | 2 +- .github/workflows/dev.yml | 90 ------------------- .../parser/NoticeHtmlParserTemplateTest.java | 2 +- 3 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 .github/workflows/dev.yml diff --git "a/.github/workflows/\bprod-kr.yml" "b/.github/workflows/\bprod-kr.yml" index 08701919..e66486e0 100644 --- "a/.github/workflows/\bprod-kr.yml" +++ "b/.github/workflows/\bprod-kr.yml" @@ -6,7 +6,7 @@ name: Deploy to prod KR on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ main ] + branches: [ develop ] env: GPG_PASSPHRASE: ${{ secrets.KR_PROD_GPG_PASSPHRASE }} diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml deleted file mode 100644 index 0695cde1..00000000 --- a/.github/workflows/dev.yml +++ /dev/null @@ -1,90 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Deploy to develop - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: - branches: [ develop ] - -env: - AWS_REGION: ${{ secrets.TEST_AWS_REGION }} - S3_BUCKET_NAME: ${{ secrets.TEST_S3_BUCKET_NAME }} - CODE_DEPLOY_APPLICATION_NAME: ${{ secrets.TEST_CODE_DEPLOY_APPLICATION_NAME }} - CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: ${{ secrets.TEST_CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} - AWS_ACCESS_KEY_ID: ${{ secrets.TEST_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY }} - - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - DB_URL: ${{ secrets.APP_ENV_TEST_DB_URL }} - DB_USER: ${{ secrets.APP_ENV_TEST_DB_USER }} - DB_PASSWORD: ${{ secrets.APP_ENV_TEST_DB_PASSWORD }} - DEPLOY_ENV: ${{ secrets.APP_ENV_TEST_DEPLOY_ENV }} - KU_ID: ${{ secrets.APP_ENV_TEST_KU_ID }} - KU_PASSWORD: ${{ secrets.APP_ENV_TEST_KU_PASSWORD }} - SENTRY_URL: ${{ secrets.APP_ENV_SENTRY_URL }} - TZ: ${{ secrets.APP_ENV_TZ }} - JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }} - JWT_EXPIRE_LENGTH: ${{ secrets.JWT_EXPIRE_LENGTH }} - -permissions: - packages: write - contents: read - id-token: write - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - environment: TestServer - - steps: - # (1) 기본 체크아웃 - - name: Checkout - uses: actions/checkout@v3 - - # (2) JDK 17 세팅 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - - # (3) firebase secret decrypt - - name: Decrypt Secrets - run: | - sh .github/workflows/decrypt.sh - - # (4) Gradle build - - name: Build with Gradle - uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee - with: - arguments: clean build - - # (5) AWS 인증 (IAM 사용자 Access Key, Secret Key 활용) - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@master - with: - aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} - - # (6) 빌드 결과물을 S3 버킷에 업로드 - - name: Upload to AWS S3 - run: | - aws deploy push \ - --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \ - --ignore-hidden-files \ - --s3-location s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \ - --source . - - # (7) S3 버킷에 있는 파일을 대상으로 CodeDeploy 실행 - - name: Deploy to AWS EC2 from S3 - run: | - aws deploy create-deployment \ - --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \ - --deployment-config-name CodeDeployDefault.AllAtOnce \ - --deployment-group-name ${{ env.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \ - --s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip diff --git a/src/test/java/com/kustacks/kuring/worker/parser/NoticeHtmlParserTemplateTest.java b/src/test/java/com/kustacks/kuring/worker/parser/NoticeHtmlParserTemplateTest.java index 5fca3915..0e00f37b 100644 --- a/src/test/java/com/kustacks/kuring/worker/parser/NoticeHtmlParserTemplateTest.java +++ b/src/test/java/com/kustacks/kuring/worker/parser/NoticeHtmlParserTemplateTest.java @@ -111,7 +111,7 @@ void LatestPageNoticeHtmlParserNoticeId() throws IOException { String viewUrl = "https://www.konkuk.ac.kr/bbs/konkuk/4017/{noticeId}/artclView.do"; // when - RowsDto rowsDto = new KuisHomepageNoticeHtmlParser().parse(doc); + RowsDto rowsDto = new LatestPageNoticeHtmlParser().parse(doc); List important = rowsDto.buildImportantRowList(viewUrl); List normal = rowsDto.buildNormalRowList(viewUrl);