Skip to content

fix(ci): harden composite action inputs in run scripts #3534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SashaMIT wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −5
Open

fix(ci): harden composite action inputs in run scripts #3534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/actions/integration-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ runs:
- name: Build alternate orchestrator
if: inputs.orchestrator-make-path != 'packages/orchestrator'
shell: bash
run: make -C "${{ inputs.orchestrator-make-path }}" build-debug
env:
ORCHESTRATOR_MAKE_PATH: ${{ inputs.orchestrator-make-path }}
run: make -C "$ORCHESTRATOR_MAKE_PATH" build-debug

- name: Initialize Host
uses: ./.github/actions/host-init
Expand Down Expand Up @@ -121,9 +123,11 @@ runs:
- name: Verify the alternate orchestrator is running
if: inputs.orchestrator-make-path != 'packages/orchestrator'
shell: bash
env:
ORCHESTRATOR_MAKE_PATH: ${{ inputs.orchestrator-make-path }}
run: |
if ! sudo pgrep -af "${{ inputs.orchestrator-make-path }}/bin/"; then
echo "::error::No orchestrator process from ${{ inputs.orchestrator-make-path }} is running."
if ! sudo pgrep -af "$ORCHESTRATOR_MAKE_PATH/bin/"; then
echo "::error::No orchestrator process from $ORCHESTRATOR_MAKE_PATH is running."
echo "::error::The start-services action probably ignored orchestrator-make-path (version without this input)."
exit 1
fi
Expand Down
8 changes: 6 additions & 2 deletions .github/actions/unit-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,19 @@ runs:
if: inputs.sudo == 'true'
shell: bash
working-directory: ${{ inputs.package }}
env:
TEST_PATH: ${{ inputs.test-path }}
run: |
trap 'sudo chown "$(id -u):$(id -g)" coverage.txt junit.xml 2>/dev/null || true' EXIT
sudo -E env "PATH=$PATH" gotestsum --junitfile=junit.xml --format=standard-verbose \
-- -timeout 20m -coverprofile=coverage.txt -covermode=atomic ${{ inputs.test-path }}
-- -timeout 20m -coverprofile=coverage.txt -covermode=atomic $TEST_PATH

- name: Run tests
if: inputs.sudo != 'true'
shell: bash
working-directory: ${{ inputs.package }}
env:
TEST_PATH: ${{ inputs.test-path }}
run: |
gotestsum --junitfile=junit.xml --format=standard-verbose \
-- -timeout 20m -coverprofile=coverage.txt -covermode=atomic ${{ inputs.test-path }}
-- -timeout 20m -coverprofile=coverage.txt -covermode=atomic $TEST_PATH