From 19b8bf81bf1d2f9379ab3f95be690479b3966393 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Thu, 27 Jun 2024 13:11:52 +0200 Subject: [PATCH] ci: use known name for M+ zip That way we don't have to start looking for it after the download is complete, but can just assume it has a certain name. --- .github/workflows/ci_msbuild.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_msbuild.yaml b/.github/workflows/ci_msbuild.yaml index 949d57eb..a44b24a9 100644 --- a/.github/workflows/ci_msbuild.yaml +++ b/.github/workflows/ci_msbuild.yaml @@ -94,6 +94,7 @@ jobs: --repo="yaskawa-global/micro_ros_motoplus" \ download \ --pattern="micro_ros_motoplus*.zip" \ + --output="micro_ros_motoplus.zip" \ release-${{ matrix.uros.codename }}-${{ matrix.controller }}-${{ matrix.uros.release }} - name: Setup MotoROS2 build dir @@ -105,25 +106,10 @@ jobs: cp -r "${{ github.workspace }}"/* /c/build/ ls -al /c/build - - name: "Find downloaded M+ libmicroros (${{ matrix.uros.codename }}-${{ matrix.uros.release }} for ${{ steps.uppercaser.outputs.ctrlr }})" - id: find_libmicroros - shell: bash - # bit of a kludge, but works for now. - # we need to do this as 'fetch-gh-release-asset' will try to rename downloaded - # files if we use a regex to match 'unknown' files instead of hard-coding - # everything. - # NOTE: the regex includes the absolute path to the location of the .zip as that's - # how find reports them to the regex engine (because we specify an absolute path - # as the location for find to search for files) - run: | - LIBM_ZIP=$(find /c/build -type f -regextype posix-extended -regex "/c/build/micro_ros_motoplus_${{ matrix.controller }}-${{ matrix.uros.codename }}.*[[:digit:]]+\.zip") - echo "libmicroros_zip=${LIBM_ZIP}" >> $GITHUB_OUTPUT - echo "libmicroros_zip_win=$(cygpath -w ${LIBM_ZIP})" >> $GITHUB_OUTPUT - echo "Found libmicroros zip: '${LIBM_ZIP}'" - name: Extract M+ libmicroros distribution shell: bash run: | - unzip -q "${{ steps.find_libmicroros.outputs.libmicroros_zip }}" \ + unzip -q /c/build/micro_ros_motoplus.zip \ -d /c/build/motoros2/libmicroros_${{ matrix.controller }}_${{ matrix.uros.codename }} - name: Download and setup M+ SDK (mpBuilder)