From b9ff7373453fa46190e267b4e6013ced0994b8a0 Mon Sep 17 00:00:00 2001 From: nkozlovskiy Date: Fri, 1 Dec 2023 17:52:50 +0300 Subject: ci: better architecture choice of TESTMO_SOURCE based on architecture and suffix, not by runner_label as before --- .github/actions/test/action.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index e7b9c1409d4..3b712d24926 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -93,8 +93,13 @@ runs: run: | RUN_URL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" BRANCH_TAG="$GITHUB_REF_NAME" - TESTMO_SOURCE="${{ inputs.log_suffix }}" - TESTMO_SOURCE="cmake-${TESTMO_SOURCE/_/-}" + ARCH="${{ runner.arch == 'X64' && 'x86-64' || runner.arch == 'ARM64' && 'arm64' || 'unknown' }}" + LOG_SUFFIX="${{ inputs.log_suffix }}" + TESTMO_SOURCE="cmake-${ARCH}" + + if [ ! -z "${LOG_SUFFIX}" ]; then + TESTMO_SOURCE="${TESTMO_SOURCE}-${LOG_SUFFIX/_/-}" + fi case $GITHUB_EVENT_NAME in workflow_dispatch) -- cgit v1.3