Merge branch 'iron' into iron-sync

moveit · Sep 7, 2023 · 6608798 · 6608798
2 parents 84421ea + 93c48b0
commit 6608798
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 46 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,19 +8,19 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - iron
 
 jobs:
   default:
     strategy:
       fail-fast: false
       matrix:
         env:
-          - IMAGE: rolling-ci
+          - IMAGE: iron-ci
             CCOV: true
-            ROS_DISTRO: rolling
-          - IMAGE: rolling-ci-testing
-            ROS_DISTRO: rolling
+            ROS_DISTRO: iron
+          - IMAGE: iron-ci-testing
+            ROS_DISTRO: iron
             IKFAST_TEST: true
             CLANG_TIDY: pedantic
           - IMAGE: humble-ci

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - iron
   pull_request:
     paths:
       - .docker/**
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -101,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -143,7 +143,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write

diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
@@ -8,7 +8,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - iron
 
 jobs:
   pre-commit:

diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [rolling]
+        distro: [iron]
 
     env:
       ROS_DISTRO: ${{ matrix.distro }}

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -9,14 +9,14 @@ on:
 jobs:
   default:
     env:
-      ROS_DISTRO: rolling
+      ROS_DISTRO: iron
       CXXFLAGS: >-
         -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls
       CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
-      DOCKER_IMAGE: moveit/moveit2:rolling-ci
+      DOCKER_IMAGE: moveit/moveit2:iron-ci
       UPSTREAM_WORKSPACE: >
         moveit2.repos
-        $(f="moveit2_$(sed 's/-.*$//' <<< "rolling-ci").repos"; test -r $f && echo $f)
+        $(f="moveit2_$(sed 's/-.*$//' <<< "iron-ci").repos"; test -r $f && echo $f)
       # Pull any updates to the upstream workspace (after restoring it from cache)
       AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src
       AFTER_SETUP_DOWNSTREAM_WORKSPACE: vcs pull $BASEDIR/downstream_ws/src
@@ -38,7 +38,7 @@ jobs:
       BASEDIR: ${{ github.workspace }}/.work
       ADDITIONAL_DEBS: lld
 
-    name: rolling-ci-ccov-sonar
+    name: iron-ci-ccov-sonar
     runs-on: ubuntu-latest
     steps:
       - name: "Free up disk space"
@@ -77,15 +77,15 @@ jobs:
           key: ${{ env.CACHE_PREFIX }}-${{ github.run_id }}
           restore-keys: ${{ env.CACHE_PREFIX }}
         env:
-          CACHE_PREFIX: ${{ steps.rosdistro_release_date.outputs.date }}-upstream_ws-${{ steps.repos_edit_timestamp.outputs.timestamp }}-rolling-ci-${{ hashFiles('moveit2*.repos', '.github/workflows/ci.yaml') }}
+          CACHE_PREFIX: ${{ steps.rosdistro_release_date.outputs.date }}-upstream_ws-${{ steps.repos_edit_timestamp.outputs.timestamp }}-iron-ci-${{ hashFiles('moveit2*.repos', '.github/workflows/ci.yaml') }}
       - name: Cache ccache
         uses: pat-s/always-upload-cache@v3.0.11
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ccache-rolling-ci-ccov-${{ github.sha }}-${{ github.run_id }}
+          key: ccache-iron-ci-ccov-${{ github.sha }}-${{ github.run_id }}
           restore-keys: |
-            ccache-rolling-ci-ccov-${{ github.sha }}
-            ccache-rolling-ci-ccov
+            ccache-iron-ci-ccov-${{ github.sha }}
+            ccache-iron-ci-ccov
       - name: Configure ccache
         run: |
           mkdir -p ${{ env.CCACHE_DIR }}

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml