Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ runs:

- run: echo "GH_ACTION_ROOT=$(ls -d ./../../_actions/LocalStack/setup-localstack/* | grep -v completed)" >> $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' }}
Expand Down Expand Up @@ -133,8 +133,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: |-
Expand Down
4 changes: 2 additions & 2 deletions finish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ runs:
steps:
- name: Start LocalStack
run: |
pip install --upgrade pip
which localstack > /dev/null || pip install localstack
if [ "$INSTALL_AWSLOCAL" = true ]; then
which awslocal > /dev/null || pip install awscli-local[ver1]
fi

shell: bash
env:
INSTALL_AWSLOCAL: "${{ inputs.install-awslocal }}"
Expand Down