Skip to content

Commit

Permalink
Adjust working directory in collect-info
Browse files Browse the repository at this point in the history
I can see problems in eden_gcp workflow where eden subdirectory does
not exist. Let's use input variable to set working-directory aligned
with our expectation.

Signed-off-by: Petr Fedchenkov <[email protected]>
  • Loading branch information
giggsoff committed Oct 4, 2023
1 parent 330c060 commit 423e1ba
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .github/actions/collect-info/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: 'Collect and store debug info'
description: 'Collect debug info using EVE script executed via ssh or console and store downloaded tarball under the specified file name'

inputs:
working-directory:
description: 'Working directory of action'
default: "./eden"
runs:
using: 'composite'
steps:
Expand All @@ -11,4 +14,4 @@ runs:
./shell-scripts/collect-info-ssh.sh || ./shell-scripts/collect-info-console.sh 120
cp dist/default-eve.log.backup dist/default-eve.log || true
shell: bash
working-directory: "./eden"
working-directory: ${{ inputs.working-directory }}
8 changes: 3 additions & 5 deletions .github/workflows/eden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ jobs:
run: EDEN_TEST_STOP=n ./eden test ./tests/workflow -v debug
- name: Collect info
if: ${{ failure() }}
run: |
# Do not pollute console logs which are collected by publish-logs action.
cp dist/default-eve.log dist/default-eve.log.backup || true
./shell-scripts/collect-info-ssh.sh || ./shell-scripts/collect-info-console.sh 120
cp dist/default-eve.log.backup dist/default-eve.log || true
uses: ./.github/actions/collect-info
with:
working-directory: ${{ github.workspace }}
- name: Collect logs
if: ${{ always() }}
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/eden_gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ jobs:
- name: Collect info
if: ${{ failure() }}
uses: ./.github/actions/collect-info
with:
working-directory: ${{ github.workspace }}
- name: Collect logs
if: ${{ always() }}
run: |
Expand Down

0 comments on commit 423e1ba

Please sign in to comment.