From b4d984386303ac0c705482344229c6a6edc3fa6d Mon Sep 17 00:00:00 2001 From: Nazar Yavnyy Date: Sat, 4 Jan 2025 19:02:47 +0200 Subject: [PATCH] refactor: combine deploy actions --- .github/workflows/deploy-dev.yml | 34 -------------------------------- .github/workflows/deploy.yml | 30 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/deploy-dev.yml diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml deleted file mode 100644 index 00797fc..0000000 --- a/.github/workflows/deploy-dev.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: deploy-dev -on: - workflow_dispatch: - -jobs: - build: - uses: ./.github/workflows/build.yml - deploy: - needs: build - runs-on: ubuntu-latest - environment: netlify - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-node@v3 - with: - node-version-file: '.nvmrc' - - - uses: actions/download-artifact@v3 - with: - name: dist - path: apps/website/dist - - - name: install netlify - run: npm install netlify-cli@17.10.1 -g - - - name: deploy to netlify - id: netlify_deploy - run: | - netlify deploy \ - --filter website \ - --dir apps/website/dist \ - --site ${{ secrets.NETLIFY_SITE_ID }} \ - --auth ${{ secrets.NETLIFY_AUTH_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9758014..a3f2885 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,9 +1,12 @@ name: deploy on: push: - branches: [main] + branches: [main, develop] workflow_dispatch: +env: + PROD_FLAG: ${{ github.ref_name == 'main' && '--prod' || '' }} + jobs: build: uses: ./.github/workflows/build.yml @@ -14,23 +17,24 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.14.1 - - uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' - - run: pnpm install - - uses: actions/download-artifact@v3 with: name: dist path: apps/website/dist - - uses: netlify/actions/cli@master - with: - args: deploy --prod - env: - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + + - name: install netlify + run: npm install netlify-cli@17.10.1 -g + + - name: deploy to netlify + id: netlify_deploy + run: | + netlify deploy \ + --filter website \ + --dir apps/website/dist \ + --site ${{ secrets.NETLIFY_SITE_ID }} \ + --auth ${{ secrets.NETLIFY_AUTH_TOKEN }} \ + $PROD_FLAG