Update CI setup files to work for RHEL out of the box and add file fo…

…r spell-check ignore words. (StoglRobotics#75)
Robotgir · Oct 6, 2022 · 5642291 · 5642291
1 parent 98f34ea
commit 5642291
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/scripts/setup-repository-ci.bash b/scripts/setup-repository-ci.bash
@@ -202,6 +202,7 @@ formatting=${formatting:="no"}
 if  [[ "$formatting" == "yes" ]]; then
   cp -n ${PACKAGE_TEMPLATES}/.clang-format .
   cp -n ${PACKAGE_TEMPLATES}/.pre-commit-config.yaml .
+  touch ".codespell-ignore-words.txt"
   pre-commit install
   pre-commit autoupdate
 fi

diff --git a/templates/package/.pre-commit-config.yaml b/templates/package/.pre-commit-config.yaml
@@ -139,5 +139,5 @@ repos:
     rev: v2.1.0
     hooks:
       - id: codespell
-        args: ['--write-changes']
+        args: ['--ignore-words=.codespell-ignore-words.txt', '--write-changes']
         exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
diff --git a/templates/package/CI-github_reusable-industrial-ci-with-cache.yml b/templates/package/CI-github_reusable-industrial-ci-with-cache.yml
@@ -54,7 +54,7 @@ jobs:
     env:
       CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
       BASEDIR: ${{ github.workspace }}/${{ inputs.basedir }}
-      CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.os_code_name }}-${{ inputs.ros_repo }}-${{ github.job }}
+      CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
     steps:
       - name: Checkout ${{ inputs.ref }} when build is not scheduled
         if: ${{ github.event_name != 'schedule' }}

diff --git a/templates/package/CI-github_rhel-binary-build.yml b/templates/package/CI-github_rhel-binary-build.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ROS_DISTRO: $ros_distro$
-    container: ghcr.io/ros-controls/ros:${{ env.ROS_DISTRO }}-rhel
+    container: ghcr.io/ros-controls/ros:$ros_distro$-rhel
     steps:
       - uses: actions/checkout@v3
         with: