Merge pull request #406 from manala/elao.app.docker/deploy-dir-app

[Elao - App -Docker] Fixup deployment URL for apps in subdir
manala · Dec 7, 2023 · bb5f6ce · bb5f6ce
2 parents 5d0cb19 + 4150e60
commit bb5f6ce
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/elao.app.docker/.manala/github/deliveries/deploy/action.yaml.tmpl b/elao.app.docker/.manala/github/deliveries/deploy/action.yaml.tmpl
@@ -23,11 +23,7 @@ inputs:
 outputs:
   deployment_url:
     description: The deployed app URL
-    {{- if $apps }}
-    value: {{ `${{ steps[format('deployment_url_{0}_{1}', inputs.app, inputs.tier)].outputs.deployment_url }}` }}
-    {{- else }}
-    value: {{ `${{ steps[format('deployment_url_{0}', inputs.tier)].outputs.deployment_url }}` }}
-    {{- end }}
+    value: {{ `${{ steps.deployment_url.outputs.deployment_url }}` }}
 
 runs:
   using: composite
@@ -50,13 +46,12 @@ runs:
 
     {{ if hasKey $delivery "deploy_url" -}}
     - name: Set deployment url for {{ $delivery_name }}
-      id: deployment_url_{{ $delivery_id_suffix }}
       if: {{ $delivery_if }}
       shell: bash
       {{- if hasKey $delivery "deploy_url" }}
-      run: echo "deployment_url={{ $delivery.deploy_url }}" >> $GITHUB_OUTPUT
+      run: echo "MANALA_DELIVERIES_DEPLOYMENT_URL={{ $delivery.deploy_url }}" >> $GITHUB_ENV
       {{- else }}
-      run: echo "deployment_url=" >> $GITHUB_OUTPUT
+      run: echo "MANALA_DELIVERIES_DEPLOYMENT_URL=" >> $GITHUB_ENV
       {{- end }}
     {{- else -}}
     # No deploy url configured for {{ $delivery_name }}
@@ -68,6 +63,11 @@ runs:
     # Deploy #
     ##########
 
+    - name: Save deployment url
+      id: deployment_url
+      shell: bash
+      run: {{ `echo "deployment_url=${{ env.MANALA_DELIVERIES_DEPLOYMENT_URL }}" >> $GITHUB_OUTPUT` }}
+
     {{ `- name: >
         Deploy
         ${{ inputs.app && format('{0}', inputs.app) || '' }}@${{ inputs.tier }}