Skip to content

Commit 7edb1e8

Browse files
committed
Join up steps properly
1 parent 4aa2a20 commit 7edb1e8

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

.github/actions/acceptance-tests/action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,21 @@ runs:
4040
GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
4141

4242
- name: "Set PR NUMBER"
43+
id: set_pr_number
4344
shell: bash
4445
run: |
45-
echo "PR_NUMBER=${{ inputs.targetEnvironment }}" >> $GITHUB_ENV
46+
echo "PR_NUMBER=${{ inputs.targetEnvironment }}" >> $GITHUB_OUTPUT
4647
4748
- name: "Determine if proxy has been deployed"
4849
if: ${{ inputs.testType == 'e2e' }}
4950
id: check_proxy_deployed
5051
env:
5152
GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
52-
PR_NUMBER: ${{ steps.pr_exists.outputs.pr_number }}
53+
PR_NUMBER: ${{ steps.set_pr_number.outputs.pr_number }}
5354
shell: bash
5455
run: |
5556
if [[ -z "$PR_NUMBER" ]]; then
56-
echo "No pull request detected; proxy deployment was deployed."
57+
echo "No pull request detected; proxy was deployed."
5758
echo "proxy_deployed=true" >> $GITHUB_OUTPUT
5859
exit 0
5960
fi

.github/workflows/stage-4-acceptance.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ jobs:
6666
echo "ENVIRONMENT=main" >> $GITHUB_ENV
6767
fi
6868
69-
- name: "Set tests to run"
70-
shell: bash
71-
run: |
72-
if [ "${{ inputs.proxy_deployed }}" == "true" ]; then
73-
echo 'TESTS_TO_RUN=["component","e2e","sandbox"]' >> $GITHUB_ENV
74-
else
75-
echo 'TESTS_TO_RUN=["component","sandbox"]' >> $GITHUB_ENV
76-
fi
77-
7869
- name: Trigger Acceptance Tests
7970
shell: bash
8071
env:

0 commit comments

Comments
 (0)