Doble/ShiftSync
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Feature/settings page #17

Closed
mattdimegs wants to merge 26 commits from feature/settings-page into main
pull from: feature/settings-page
merge into: Doble:main
Conversation 0 Commits 26 Files changed 13 +6
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e60de19e02 - Show all commits

1
.github/workflows/web-container.yml vendored
View file

@ -82,6 +82,7 @@ jobs:
environments: ${{ matrix.env }} environments: ${{ matrix.env }}
workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }} workflow_type: ${{ needs.determine-workflow.outputs.workflow_type }}
branch: ${{ github.head_ref || github.ref_name }} branch: ${{ github.head_ref || github.ref_name }}
current_version: ${{ needs.determine-workflow.outputs.current_version }}
secrets: secrets:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

5
.github/workflows/web-deploy-prod.yml vendored
View file

@ -14,6 +14,10 @@ on:
type: string type: string
description: An optional string to define which branch to checkout. description: An optional string to define which branch to checkout.
default: 'main' default: 'main'
current_version:
type: string
description: Current Version of the package.json.
default: '0.0.0'
secrets: secrets:
DOCKERHUB_USER: {} DOCKERHUB_USER: {}
DOCKERHUB_TOKEN: {} DOCKERHUB_TOKEN: {}
@ -51,6 +55,7 @@ jobs:
else else
echo "DOCKERHUB_TOKEN secret is set" echo "DOCKERHUB_TOKEN secret is set"
fi fi
echo "${{inputs.current_version}}"
build: build:
needs: check-inputs needs: check-inputs
if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release' if: needs.check-inputs.result == 'success' && inputs.workflow_type == 'release'