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

Merge branch 'main' into feature/settings-page

Browse source
This commit is contained in:
Matt DiMeglio 2025-06-12 16:12:27 -04:00
commit 79c3acb6be
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ jobs:
workflow_type: ${{ steps.workflow.outputs.workflow_type }} workflow_type: ${{ steps.workflow.outputs.workflow_type }}
workflow_envs: ${{ steps.workflow.outputs.workflow_envs }} workflow_envs: ${{ steps.workflow.outputs.workflow_envs }}
release_type: ${{ steps.workflow.outputs.release_type }} release_type: ${{ steps.workflow.outputs.release_type }}
current_version: ${{ steps.workflow.outputs.current_version }} current_version: ${{ steps.package-version.outputs.current-version }}
steps: steps:
- name: Determine Workflow - name: Determine Workflow
id: workflow id: workflow
@ -30,7 +30,6 @@ jobs:
event=${{ github.event_name }} event=${{ github.event_name }}
workflow_type='dev'; workflow_type='dev';
workflow_envs='["dev"]' workflow_envs='["dev"]'
current_version=$(cat ./package.json | jq '.version' | tr -d '"')
if [[ $event == 'workflow_dispatch' && '${{ github.ref_name }}' == 'main' ]]; if [[ $event == 'workflow_dispatch' && '${{ github.ref_name }}' == 'main' ]];
then then
echo "in if statement" echo "in if statement"
@ -40,9 +39,11 @@ jobs:
echo "workflow_type=$workflow_type" >> $GITHUB_OUTPUT echo "workflow_type=$workflow_type" >> $GITHUB_OUTPUT
echo "workflow_envs=$workflow_envs" >> $GITHUB_OUTPUT echo "workflow_envs=$workflow_envs" >> $GITHUB_OUTPUT
echo "current_version=$current_version" >> $GITHUB_OUTPUT
echo "Running $workflow_type pipeline in environments: $workflow_envs" >> $GITHUB_STEP_SUMMARY echo "Running $workflow_type pipeline in environments: $workflow_envs" >> $GITHUB_STEP_SUMMARY
- name: get-npm-version
id: package-version
uses: martinbeentjes/npm-get-version-action@v1.3.1
nonprod-deploy: nonprod-deploy:
needs: determine-workflow needs: determine-workflow
if: needs.determine-workflow.outputs.workflow_type != 'release' if: needs.determine-workflow.outputs.workflow_type != 'release'