Fix preview URL precedence (#29)

Author: lakkeger

action.yml

@@ -83,7 +83,7 @@ runs:
           tail -n1
         )" >> $GITHUB_ENV
       shell: bash
-    
+
     - name: Install tools
       uses: jenseng/dynamic-uses@v1
       if: ${{ inputs.skip-startup == 'true' || inputs.state-backend == 'ephemeral' || inputs.state-action == 'save' }}
@@ -139,8 +139,6 @@ runs:
     - name: Display Ephemeral Instance URL
       if: ${{ inputs.state-action == 'start' && inputs.state-backend == 'ephemeral' && (inputs.include-preview == 'true' || inputs.ci-project != '') }}
       uses: jenseng/dynamic-uses@v1
-      env:
-        default-include-preview: ${{ fromJSON('["false","true"]')[github.event_name == 'pull_request'] }}
       with:
         uses: ${{ env.GH_ACTION_ROOT }}/finish
         with: |-

finish/action.yml

@@ -32,8 +32,8 @@ runs:
       shell: bash
       if: inputs.include-preview
       run: |
-        if [[ -n "${{ inputs.preview-url }}" ]]; then
-          echo "LS_PREVIEW_URL=${{ inputs.preview-url }}" >> $GITHUB_ENV
+        if [[ -n "${LS_PREVIEW_URL:-${{ inputs.preview-url }}}" ]]; then
+          echo "LS_PREVIEW_URL=${LS_PREVIEW_URL:-${{ inputs.preview-url }}}" >> $GITHUB_ENV
         elif [[ -e ls-preview-url.txt ]]; then
           echo "LS_PREVIEW_URL=$(<ls-preview-url.txt)" >> $GITHUB_ENV
         else

tools/action.yml

@@ -16,7 +16,6 @@ runs:
         if [ "$INSTALL_AWSLOCAL" = true ]; then
           which awslocal > /dev/null || pip install awscli-local[ver1]
         fi
-
       shell: bash
       env:
         INSTALL_AWSLOCAL: "${{ inputs.install-awslocal }}"