Compare commits

..

No commits in common. "feature/hotfix-actions" and "main" have entirely different histories.

2 changed files with 4 additions and 6 deletions

View file

@ -2,8 +2,8 @@ name: Deploy To Production
on: on:
push: push:
tags: branches:
- '*' - main
jobs: jobs:
build: build:
@ -43,7 +43,7 @@ jobs:
DB_DATA_LOCATION: ${{ secrets.PROD_DB_DATA_LOCATION }} DB_DATA_LOCATION: ${{ secrets.PROD_DB_DATA_LOCATION }}
SERVER_PATH: ${{ secrets.PROD_SSH_SERVER_PATH }} SERVER_PATH: ${{ secrets.PROD_SSH_SERVER_PATH }}
BOT_TOKEN: ${{ secrets.PROD_BOT_TOKEN }} BOT_TOKEN: ${{ secrets.PROD_BOT_TOKEN }}
BOT_VER: ${{ github.REF_NAME }} BOT_VER: ${{ vars.PROD_BOT_VER }}
BOT_AUTHOR: ${{ vars.PROD_BOT_AUTHOR }} BOT_AUTHOR: ${{ vars.PROD_BOT_AUTHOR }}
BOT_OWNERID: ${{ vars.PROD_BOT_OWNERID }} BOT_OWNERID: ${{ vars.PROD_BOT_OWNERID }}
BOT_CLIENTID: ${{ vars.PROD_BOT_CLIENTID }} BOT_CLIENTID: ${{ vars.PROD_BOT_CLIENTID }}

View file

@ -4,8 +4,6 @@ on:
push: push:
branches: branches:
- develop - develop
- hotfix/*
- release/*
jobs: jobs:
build: build:
@ -45,7 +43,7 @@ jobs:
DB_DATA_LOCATION: ${{ secrets.STAGE_DB_DATA_LOCATION }} DB_DATA_LOCATION: ${{ secrets.STAGE_DB_DATA_LOCATION }}
SERVER_PATH: ${{ secrets.STAGE_SSH_SERVER_PATH }} SERVER_PATH: ${{ secrets.STAGE_SSH_SERVER_PATH }}
BOT_TOKEN: ${{ secrets.STAGE_BOT_TOKEN }} BOT_TOKEN: ${{ secrets.STAGE_BOT_TOKEN }}
BOT_VER: ${{ github.REF_NAME }} BOT_VER: ${{ vars.STAGE_BOT_VER }}
BOT_AUTHOR: ${{ vars.STAGE_BOT_AUTHOR }} BOT_AUTHOR: ${{ vars.STAGE_BOT_AUTHOR }}
BOT_OWNERID: ${{ vars.STAGE_BOT_OWNERID }} BOT_OWNERID: ${{ vars.STAGE_BOT_OWNERID }}
BOT_CLIENTID: ${{ vars.STAGE_BOT_CLIENTID }} BOT_CLIENTID: ${{ vars.STAGE_BOT_CLIENTID }}