diff --git a/.github/workflows/aws_cd.yml b/.github/workflows/aws_cd.yml index d099320..c9f372e 100644 --- a/.github/workflows/aws_cd.yml +++ b/.github/workflows/aws_cd.yml @@ -1,30 +1,35 @@ name: CD + on: - push: - branches: - - main + push: + branches: + - main + workflow_run: + workflows: ["Gradle CI"] + types: + - completed jobs: - deploy: - runs-on: ubuntu-latest + deploy: + runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - - name: excuting remote ssh commands - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.REMOTE_IP }} - port: ${{ secrets.REMOTE_SSH_PORT }} - username: ${{ secrets.REMOTE_USERNAME }} - key: ${{ secrets.REMOTE_KEY }} - script: | - cd /home/ubuntu/prisism-backend - git pull origin main - ./gradlew clean - ./gradlew build - docker build -t prisism/backend . - docker stop prisism-backend || true - docker rm prisism-backend || true - docker run -d -it --env-file ./.env -p 8080:8080 --name prisism-backend prisism/backend \ No newline at end of file + - name: excuting remote ssh commands + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.REMOTE_IP }} + port: ${{ secrets.REMOTE_SSH_PORT }} + username: ${{ secrets.REMOTE_USERNAME }} + key: ${{ secrets.REMOTE_KEY }} + script: | + cd /home/ubuntu/prisism-backend + git pull origin main + ./gradlew clean + ./gradlew build + docker build -t prisism/backend . + docker stop prisism-backend || true + docker rm prisism-backend || true + docker run -d -it --env-file ./.env -p 8080:8080 --name prisism-backend prisism/backend diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 53ee0df..0000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Java CI with Gradle - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 - - - name: Build with Gradle Wrapper - run: ./gradlew build \ No newline at end of file diff --git a/.github/workflows/gradle_ci.yml b/.github/workflows/gradle_ci.yml new file mode 100644 index 0000000..7cc6005 --- /dev/null +++ b/.github/workflows/gradle_ci.yml @@ -0,0 +1,42 @@ +name: Gradle CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 + + - name: Build with Gradle Wrapper + run: ./gradlew build + + ktlint: + name: Check Code Quality + runs-on: ubuntu-latest + steps: + - name: Clone repo + uses: actions/checkout@master + with: + fetch-depth: 1 + - name: ktlint + uses: ScaCap/action-ktlint@master + with: + github_token: ${{ secrets.GH_TOKEN }} + reporter: github-pr-review +