Merge branch 'main' into bugfix/code-change4john
This commit is contained in:
commit
f3d04cbe99
2 changed files with 26 additions and 26 deletions
26
.github/workflows/web-deploy-nonprod.yml
vendored
26
.github/workflows/web-deploy-nonprod.yml
vendored
|
|
@ -73,17 +73,17 @@ jobs:
|
||||||
run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }}
|
run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }}
|
||||||
- name: Docker Push Backend
|
- name: Docker Push Backend
|
||||||
run: docker push john4064/shiftsync:latest_web
|
run: docker push john4064/shiftsync:latest_web
|
||||||
# deploy:
|
deploy:
|
||||||
# needs: build
|
needs: build
|
||||||
# if: needs.build.result == 'success' && inputs.workflow_type != 'release'
|
if: needs.build.result == 'success' && inputs.workflow_type != 'release'
|
||||||
# environment: ${{ inputs.environments }}
|
environment: ${{ inputs.environments }}
|
||||||
# runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
# permissions:
|
permissions:
|
||||||
# contents: read
|
contents: read
|
||||||
# packages: write
|
packages: write
|
||||||
# steps:
|
steps:
|
||||||
# - name: Deploy to Coolify
|
- name: Deploy to Coolify
|
||||||
# run: |
|
run: |
|
||||||
# echo ${{ inputs.workflow_type }}
|
echo ${{ inputs.workflow_type }}
|
||||||
# curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
|
curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
|
||||||
|
|
||||||
|
|
|
||||||
26
.github/workflows/web-deploy-prod.yml
vendored
26
.github/workflows/web-deploy-prod.yml
vendored
|
|
@ -73,17 +73,17 @@ jobs:
|
||||||
run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }}
|
run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }}
|
||||||
- name: Docker Push Backend
|
- name: Docker Push Backend
|
||||||
run: docker push john4064/shiftsync:latest_web
|
run: docker push john4064/shiftsync:latest_web
|
||||||
# deploy:
|
deploy:
|
||||||
# needs: build
|
needs: build
|
||||||
# if: needs.build.result == 'success' && inputs.workflow_type == 'release'
|
if: needs.build.result == 'success' && inputs.workflow_type == 'release'
|
||||||
# environment: ${{ inputs.environments }}
|
environment: ${{ inputs.environments }}
|
||||||
# runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
# permissions:
|
permissions:
|
||||||
# contents: read
|
contents: read
|
||||||
# packages: write
|
packages: write
|
||||||
# steps:
|
steps:
|
||||||
# - name: Deploy to Coolify
|
- name: Deploy to Coolify
|
||||||
# run: |
|
run: |
|
||||||
# echo ${{ inputs.workflow_type }}
|
echo ${{ inputs.workflow_type }}
|
||||||
# curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
|
curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue