ci: action: Protect the script from an unbound variable

This fixes a bug with hanging during testing on the master branch: in this case, the github parameter.head_ref returns nothing. Signed-off-by: Maxim Polyakov <[email protected]>
maxpoliak · Oct 29, 2021 · 929cfee · 929cfee
1 parent b2727ef
commit 929cfee
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/.github/workflows/action-build-all-i386.yml b/.github/workflows/action-build-all-i386.yml
@@ -46,7 +46,10 @@ jobs:
  run: |
  tarball_path=$(bash ci/ci-import-rtems-tarball.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }})
  [[ "${tarball_path}" == "does-not-exist" ]] && ./build.sh rtems || echo "Image building is not required"
- pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch ${{ github.head_ref }})
+ current_branch=${{ github.head_ref }}
+ [[ -z $current_branch ]] \
+ && pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }}) \
+ || pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch $current_branch)
  echo ${pversion}
  echo "::set-env name=VERSION::$pversion"
  - name: 'Step 7: Build application. Version : ${{ env.VERSION }}'
@@ -69,7 +72,10 @@ jobs:
  - name: 'Step 2: Make preparations'
  run: |
  ./preparations.sh
- pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch ${{ github.head_ref }})
+ current_branch=${{ github.head_ref }}
+ [[ -z $current_branch ]] \
+ && pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }}) \
+ || pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch $current_branch)
  echo ${pversion}
  echo "::set-env name=VERSION::$pversion"
  - name: 'Step 3: Download artifact: ${{ env.VERSION }}-exe-artifact'
@@ -99,7 +105,10 @@ jobs:
  - name: 'Step 2: Make preparations'
  run: |
  ./preparations.sh
- pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch ${{ github.head_ref }})
+ current_branch=${{ github.head_ref }}
+ [[ -z $current_branch ]] \
+ && pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }}) \
+ || pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch $current_branch)
  echo ${pversion}
  echo "::set-env name=VERSION::$pversion"
  - name: 'Step 3: Install QEMU'
@@ -126,7 +135,10 @@ jobs:
  - name: 'Step 2: Make preparations'
  run: |
  ./preparations.sh
- pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch ${{ github.head_ref }})
+ current_branch=${{ github.head_ref }}
+ [[ -z $current_branch ]] \
+ && pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }}) \
+ || pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch $current_branch)
  echo ${pversion}
  echo "::set-env name=VERSION::$pversion"
  - name: 'Step 3: Install QEMU'
@@ -178,7 +190,10 @@ jobs:
  - name: 'Step 2: Make preparations'
  run: |
  ./preparations.sh
- pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch ${{ github.head_ref }})
+ current_branch=${{ github.head_ref }}
+ [[ -z $current_branch ]] \
+ && pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }}) \
+ || pversion=$(bash ./ci/ci-generate-version.sh --arch ${{ env.RTEMS_ARCH }} --bsp ${{ env.RTEMS_BSP }} --branch $current_branch)
  echo ${pversion}
  echo "::set-env name=VERSION::$pversion"
  - name: 'Step 3: Install QEMU'