diff --git a/.github/workflows/deploy-branch.yaml b/.github/workflows/deploy-branch.yaml index d316ac42c..f8a199eff 100644 --- a/.github/workflows/deploy-branch.yaml +++ b/.github/workflows/deploy-branch.yaml @@ -23,7 +23,7 @@ jobs: uses: ./.github/workflows/lexbox-api.yaml with: version: ${{ needs.set-version.outputs.version }} - label-latest: true + label-latest: false build-ui: name: Build UI @@ -31,7 +31,7 @@ jobs: uses: ./.github/workflows/lexbox-ui.yaml with: version: ${{ needs.set-version.outputs.version }} - label-latest: true + label-latest: false build-hgweb: name: Build hgweb @@ -39,7 +39,7 @@ jobs: uses: ./.github/workflows/lexbox-hgweb.yaml with: version: ${{ needs.set-version.outputs.version }} - label-latest: true + label-latest: false deploy: name: Deploy Develop diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b9b94a3cc..0ab79e53e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -66,6 +66,7 @@ jobs: repository: ${{ vars.FLEET_REPO }} ssh-key: ${{ secrets.FLEET_REPO_SSH_KEY }} path: fleet + ref: main - name: Copy yaml resources to fleet repo run: | cp lexbox/deployment/${{ inputs.k8s-environment }}/resources.yaml fleet/${{ inputs.k8s-environment }}/ diff --git a/.github/workflows/lexbox-hgweb.yaml b/.github/workflows/lexbox-hgweb.yaml index 4fdf066db..317270647 100644 --- a/.github/workflows/lexbox-hgweb.yaml +++ b/.github/workflows/lexbox-hgweb.yaml @@ -80,11 +80,11 @@ jobs: labels: ${{ steps.meta.outputs.labels }} deploy-hgweb: uses: ./.github/workflows/deploy.yaml - if: ${{github.ref == 'refs/heads/develop'}} + if: ${{github.ref == 'refs/heads/develop' && github.event_name == 'push'}} secrets: inherit needs: publish-hgweb with: version: ${{ needs.publish-hgweb.outputs.version }} image: 'ghcr.io/sillsdev/lexbox-hgweb' - deploy-domain: 'develop.lexbox.org' + deploy-domain: lexbox.dev.languagetechnology.org k8s-environment: 'develop'