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:33:18 -04:00
commit bb8a672b98
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.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.package_version.outputs.current_version }} current_version: ${{ steps.version.outputs.current_version }}
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -44,16 +44,11 @@ jobs:
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: Extract Version - name: Extract Version
id: package_version id: version
shell: bash shell: bash
run: | run: |
ls -la web/package.json
version=$(jq -r '.version' web/package.json) version=$(jq -r '.version' web/package.json)
echo "Version is: $version"
echo "current_version=$version" >> "$GITHUB_OUTPUT" echo "current_version=$version" >> "$GITHUB_OUTPUT"
- name: Use version
run: |
echo "Extracted version: ${{ steps.package_version.outputs.current_version }}"
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'
@ -66,6 +61,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 }}