Minor tweaks

ubi-agni · Oct 11, 2023 · bcd8e6e · bcd8e6e
1 parent e5014ba
commit bcd8e6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/interactive.yaml b/.github/workflows/interactive.yaml
@@ -80,8 +80,8 @@ jobs:
       ROS_SOURCES: ${{ inputs.ROS_SOURCES || vars.ROS_SOURCES }}
       EXTRA_DEB_SOURCES: "${{ inputs.CONTINUE_BUILD && \
           format('deb [trusted=yes] https://ros.packages.techfak.net/{0} {1} main', \
-          fromJSON('{ \"jammy\": \"ubuntu\", \"bookworm\": \"debian\" }')[inputs.DEB_DISTRO || vars.DEB_DISTRO], \
-          inputs.DEB_DISTRO || vars.DEB_DISTRO) }}"
+                 fromJSON('{ \"jammy\": \"ubuntu\", \"bookworm\": \"debian\" }')[inputs.DEB_DISTRO || vars.DEB_DISTRO], \
+                 inputs.DEB_DISTRO || vars.DEB_DISTRO) || '' }}"
       COLCON_PKG_SELECTION: ${{ inputs.COLCON_PKG_SELECTION || vars.COLCON_PKG_SELECTION || '' }}
       # proceed from existing debs artifact if run_attempt > 1
       DOWNLOAD_DEBS: ${{ github.run_attempt != '1' }}

diff --git a/main.js b/main.js
@@ -43,7 +43,7 @@ process.on('SIGTERM', handle)
 child.on('exit', function (exit_code, signal) {
   const expect = core.getInput('EXPECT_EXIT_CODE') || 0 // expected exit code
   exit_code = exit_code !== null ? exit_code : 143
-  const suffix = exit_code == expect ? '' : ' != ' + expect + ' (as expected)'
+  const suffix = exit_code == expect ? ' (as expected)' : ' != ' + expect
   const msg = 'Process finished with code ' + exit_code + suffix
   exit_code == expect ? core.debug(msg) : core.warning(msg)
   process.exit(exit_code == expect ? 0 : 1)