From 6decf04af072f204c46c6a8b57de0430284c850f Mon Sep 17 00:00:00 2001
From: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
Date: Thu, 29 Aug 2024 15:50:14 +0200
Subject: [PATCH] CI: Update actions

---
 .github/workflows/format.yml                  |  5 ++--
 .github/workflows/industrial_ci_action.yml    |  9 ++++----
 .github/workflows/prerelease.yml              | 23 +++++++++++--------
 .pre-commit-config.yaml                       |  4 ++--
 .../launch/moveit_rviz.launch.py              |  6 +++--
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 34b5dc64..eed9d1bd 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -15,6 +15,5 @@ jobs:
     name: Format
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.0
+    - uses: actions/checkout@v4
+    - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
index 8eea8799..550c494e 100644
--- a/.github/workflows/industrial_ci_action.yml
+++ b/.github/workflows/industrial_ci_action.yml
@@ -26,12 +26,13 @@ jobs:
     name: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
+          save-always: true
           path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}-${{ github.sha }}  
+          key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}-${{ github.sha }}
           restore-keys: |
             ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
-      - uses: 'ros-industrial/industrial_ci@master'
+      - uses: ros-industrial/industrial_ci@master
         env: ${{ matrix.env }}
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 9d09d603..ee1b419a 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -5,22 +5,25 @@ name: pre-release
 
 on:
   workflow_dispatch:
+    inputs:
+      ROS_DISTRO:
+        type: string
+        required: true
+        description: 'ROS distribution codename:'
+        default: rolling
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
 
 jobs:
   default:
-    strategy:
-      fail-fast: false
-      matrix:
-        distro: [foxy, galactic, humble, rolling]
-
     env:
-      ROS_DISTRO: ${{ matrix.distro }}
+      ROS_DISTRO: ${{ inputs.ROS_DISTRO }}
       PRERELEASE: true
       BASEDIR: ${{ github.workspace }}/.work
 
-    name: "${{ matrix.distro }}"
+    name: "${{ inputs.ROS_DISTRO }}"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: industrial_ci
-        uses: ros-industrial/industrial_ci@master
+      - uses: actions/checkout@v4
+      - uses: ros-industrial/industrial_ci@master
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e77f9fd5..6f2ec9e2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@
 repos:
   # Standard hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -28,6 +28,6 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.8.0
     hooks:
       - id: black
diff --git a/panda_moveit_config/launch/moveit_rviz.launch.py b/panda_moveit_config/launch/moveit_rviz.launch.py
index bb635344..f9734d19 100644
--- a/panda_moveit_config/launch/moveit_rviz.launch.py
+++ b/panda_moveit_config/launch/moveit_rviz.launch.py
@@ -17,7 +17,8 @@ def load_file(package_name, file_path):
     try:
         with open(absolute_file_path, "r") as file:
             return file.read()
-    except EnvironmentError:  # parent of IOError, OSError *and* WindowsError where available
+    # parent of IOError, OSError *and* WindowsError where available
+    except EnvironmentError:
         return None
 
 
@@ -28,7 +29,8 @@ def load_yaml(package_name, file_path):
     try:
         with open(absolute_file_path, "r") as file:
             return yaml.safe_load(file)
-    except EnvironmentError:  # parent of IOError, OSError *and* WindowsError where available
+    # parent of IOError, OSError *and* WindowsError where available
+    except EnvironmentError:
         return None