From 766e0069003643ca6cc92ad3e0e34a524ae99553 Mon Sep 17 00:00:00 2001 From: Marcin Tracz Date: Wed, 7 Dec 2022 14:08:17 +0100 Subject: [PATCH] #115 - force pass env variable to make script in deploy workflows (#275) force pass env variable to make script in deploy workflows --- .github/workflows/deploy-to-beta.yml | 7 +------ .github/workflows/deploy-to-prod.yml | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-to-beta.yml b/.github/workflows/deploy-to-beta.yml index 07c2e2e1..0c0fcabb 100644 --- a/.github/workflows/deploy-to-beta.yml +++ b/.github/workflows/deploy-to-beta.yml @@ -76,9 +76,6 @@ jobs: - name: run deployment script over ssh uses: appleboy/ssh-action@v0.1.5 - env: - TEST_NAME: ${{ needs.pr_commented.outputs.branch-name }} - BRANCH_NAME: ${{ env.BRANCH_NAME }} with: timeout: 10s command_timeout: 10m @@ -86,10 +83,8 @@ jobs: port: ${{ secrets.TOBY_VPS_PORT }} username: ${{ secrets.TOBY_VPS_USERNAME }} password: ${{ secrets.TOBY_VPS_PASSWORD }} - envs: BRANCH_NAME,TEST_NAME script_stop: true - debug: true - script: make --makefile=/blumilk/beta/projects/toby/Makefile beta-deploy + script: BRANCH_NAME=${{ env.BRANCH_NAME }} make --makefile=/blumilk/beta/projects/toby/Makefile beta-deploy - name: comment PR that changes has been deployed to beta if: github.event_name != 'workflow_dispatch' diff --git a/.github/workflows/deploy-to-prod.yml b/.github/workflows/deploy-to-prod.yml index 3204f245..0c0d4073 100644 --- a/.github/workflows/deploy-to-prod.yml +++ b/.github/workflows/deploy-to-prod.yml @@ -25,7 +25,6 @@ jobs: port: ${{ secrets.TOBY_VPS_PORT }} username: ${{ secrets.TOBY_VPS_USERNAME }} password: ${{ secrets.TOBY_VPS_PASSWORD }} - envs: BRANCH_NAME script_stop: true - script: make --makefile=/blumilk/production/toby/Makefile prod-deploy + script: BRANCH_NAME=${{ env.BRANCH_NAME }} make --makefile=/blumilk/production/toby/Makefile prod-deploy