Skip to content

Commit cb9940d

Browse files
authored
GAIAPLAT-2062 - Attempt to fix build break (#1369)
https://gaiaplatform.atlassian.net/browse/GAIAPLAT-2062
1 parent c6d2b90 commit cb9940d

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.github/actions/integration-test-job/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
- name: Check for Previously Downloaded SDK Package
3333
shell: bash
3434
run: |
35-
if [ "$(ls -A ${{ github.workspace }}/packages)" ]; then
35+
if [ "$(ls -A ${{ inputs.gaia-repo }}/build/output/package)" ]; then
3636
echo "SDK=present" >> $GITHUB_ENV
3737
else
3838
echo "SDK=not-present" >> $GITHUB_ENV
@@ -42,7 +42,7 @@ runs:
4242
if: ${{ env.SDK }} != 'present'
4343
uses: actions/cache@v2
4444
with:
45-
path: ${{ inputs.gaia-repo }}/packages
45+
path: ${{ inputs.gaia-repo }}/build/output/package
4646
key: latest-release-sdk-package
4747

4848
- name: Tests
@@ -55,7 +55,7 @@ runs:
5555
--repo-path ${{ inputs.gaia-repo }} \
5656
--db-persistence ${{ inputs.db-persistence }} \
5757
--suite-name ${{ inputs.suite-name }} \
58-
--package ${{ inputs.gaia-repo }}/packages
58+
--package ${{ inputs.gaia-repo }}/build/output/package
5959
6060
- name: Upload Output Files
6161
if: always()

.github/workflows/integration-only.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@ jobs:
2626
- name: Create Directory To Host Install Package Cache
2727
shell: bash
2828
run: |
29-
mkdir -p ${{ github.workspace }}/packages
29+
mkdir -p ${{ github.workspace }}/build/output/package
3030
3131
- name: Download Debian Install Package
3232
continue-on-error: true
3333
uses: actions/download-artifact@v2
3434
with:
3535
name: SDK Install Package
36-
path: ${{ github.workspace }}/packages
36+
path: ${{ github.workspace }}/build/output/package
37+
38+
- name: Create Directory To Host Install Package Cache
39+
shell: bash
40+
run: |
41+
ls -la ${{ github.workspace }}/build/output/package
3742
3843
- name: Run Integration Tests
3944
uses: ./.github/actions/integration-test-job

.github/workflows/main.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
needs:
7676
- Lint
7777
- Third-Party
78-
if: github.event_name != 'pull_request'
78+
# if: github.event_name != 'pull_request'
7979
runs-on: ubuntu-20.04
8080
env:
8181
GAIA_REPO: ${{ github.workspace }}
@@ -169,7 +169,7 @@ jobs:
169169
Integration_Tests:
170170
needs:
171171
- SDK
172-
if: github.event_name != 'pull_request'
172+
# if: github.event_name != 'pull_request'
173173
runs-on: ubuntu-20.04
174174
timeout-minutes: 7
175175
env:
@@ -186,14 +186,19 @@ jobs:
186186
- name: Create Directory To Host Install Package Cache
187187
shell: bash
188188
run: |
189-
mkdir -p ${{ github.workspace }}/packages
189+
mkdir -p ${{ github.workspace }}/build/output/package
190190
191191
- name: Download Debian Install Package
192192
continue-on-error: true
193193
uses: actions/download-artifact@v2
194194
with:
195195
name: SDK Install Package
196-
path: ${{ github.workspace }}/packages
196+
path: ${{ github.workspace }}/build/output/package
197+
198+
- name: Create Directory To Host Install Package Cache
199+
shell: bash
200+
run: |
201+
ls -la ${{ github.workspace }}/build/output/package
197202
198203
- name: Run Integration Tests
199204
uses: ./.github/actions/integration-test-job

dev_tools/github-actions/execute_tests_against_package.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ fi
194194
cd "$PACKAGE_PATH" || exit
195195
# shellcheck disable=SC2061
196196
INSTALL_PATH="$(find . -name gaia*)"
197+
if [[ -z "$INSTALL_PATH" ]] ; then
198+
ls -la "$PACKAGE_PATH"
199+
complete_process 1 "Debian package to install could not be found."
200+
fi
197201

198202
if [ "$VERBOSE_MODE" -ne 0 ]; then
199203
echo "Installing Debian package '$INSTALL_PATH'..."

0 commit comments

Comments
 (0)