Skip to content

Commit fccca28

Browse files
committed
multi-arch-test-build: fix ci_helpers path
Change CI_HELPER to CI_HELPERS Remove unused dockerfiles_feeds volume Signed-off-by: George Sapkin <george@sapk.in>
1 parent a2e7980 commit fccca28

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/dockerfiles_feeds/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ elif [ $PKG_MANAGER = "apk" ]; then
2222
apk update
2323
fi
2424

25-
CI_HELPER="${CI_HELPER:-/ci/.github/workflows/ci_helpers.sh}"
25+
CI_HELPERS="${CI_HELPERS:-/scripts/ci_helpers.sh}"
2626

2727
for PKG in /ci/*.[ai]pk; do
2828
if [ $PKG_MANAGER = "opkg" ]; then
@@ -62,7 +62,7 @@ for PKG in /ci/*.[ai]pk; do
6262
continue
6363
fi
6464

65-
export PKG_NAME PKG_VERSION CI_HELPER
65+
export PKG_NAME PKG_VERSION CI_HELPERS
6666

6767
if [ -f "$PRE_TEST_SCRIPT" ]; then
6868
echo "Use package specific pre-test.sh"

.github/workflows/multi-arch-test-build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,9 @@ jobs:
243243
- name: Test via Docker container
244244
if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
245245
run: |
246-
docker run --platform linux/${{ matrix.arch }} --rm -v $GITHUB_WORKSPACE:/ci \
247-
-v $GITHUB_WORKSPACE/dockerfiles_feeds:/dockerfiles_feeds \
248-
-e CI_HELPER=/dockerfiles_feeds/scripts/ci_helpers.sh \
246+
docker run --platform linux/${{ matrix.arch }} --rm \
247+
-v $GITHUB_WORKSPACE:/ci \
248+
-v $GITHUB_WORKSPACE/dockerfiles_feeds/.github/scripts:/scripts \
249+
-e CI_HELPERS=/scripts/ci_helpers.sh \
249250
-e PKG_MANAGER=${{ env.PKG_MANAGER }} \
250251
test-container

0 commit comments

Comments
 (0)