diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23a23b5..bffe945 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: CI +name: Build on: pull_request jobs: build: @@ -11,4 +11,4 @@ jobs: cmd: install # will run `yarn install` command - uses: borales/actions-yarn@v3.0.0 with: - cmd: build # will run `yarn build` command \ No newline at end of file + cmd: build # will run `yarn build` command diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index d5dc375..2063765 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -1,11 +1,11 @@ -name: build and push code +name: CI on: push: branches: - main jobs: git-push: - name: build and push + name: Build and push runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -24,10 +24,21 @@ jobs: destination-repository-name: 'express-build' user-email: dev.kayoung@gmail.com target-branch: main -# deploy: -# name: deploy pm2 -# needs: git-push -# runs-on: [self-hosted, production] -# steps: -# - name: run shell script -# run: /home/ubuntu/deploy-piickle-server.sh + sync-branches: + name: Sync main -> develop + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up Node + uses: actions/setup-node@v1 + with: + node-version: 12 + - name: Opening pull request + id: pull + uses: tretuna/sync-branches@1.4.0 + with: + GITHUB_TOKEN: ${{ secrets.TOKEN_FOR_PR }} + FROM_BRANCH: "main" + TO_BRANCH: "develop" + PULL_REQUEST_TITLE: "sync: ${{ github.head_ref || github.ref_name }} -> main -> develop"