From 56422912fc59815fdf82f2492c86da594e67825c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=A0togl?= <denis@stoglrobotics.de>
Date: Thu, 6 Oct 2022 17:29:11 +0200
Subject: [PATCH] Update CI setup files to work for RHEL out of the box and add
 file for spell-check ignore words. (#75)

---
 scripts/setup-repository-ci.bash                                | 1 +
 templates/package/.pre-commit-config.yaml                       | 2 +-
 .../package/CI-github_reusable-industrial-ci-with-cache.yml     | 2 +-
 templates/package/CI-github_rhel-binary-build.yml               | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/setup-repository-ci.bash b/scripts/setup-repository-ci.bash
index 0d4cc7a0..fa38d33d 100755
--- 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
index fa8d7510..9553001c 100644
--- 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
index 0ff359d0..490b680e 100644
--- 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
index 9d6c1ea2..b4e16f64 100644
--- 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: