From b0e063421432b8d07ebe7e0b3bfd53f9121fd51b Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Tue, 1 Jul 2025 21:18:31 +0900 Subject: [PATCH 1/5] [ga] Add test for macos-14 and macos-15 (Apple Silicon) --- .github/workflows/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 8ecab1b2..4f7a856c 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -186,7 +186,18 @@ jobs: osx: - runs-on: macos-13 # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md + strategy: + matrix: + include: + # https://github.com/actions/runner-images/tree/main/images/macos + # Note: To test macOS-x with Intel architecture, + # you need to use the paid macOS-x-large runner, as macOS-x is grouped with ARM-based runners. + # https://docs.github.com/en/actions/concepts/runners/about-larger-runners + - runs-on: macos-13 # Intel (x64) + - runs-on: macos-14 # ARM64 (Apple Silicon) + - runs-on: macos-15 # ARM64 (Apple Silicon) + fail-fast: false + runs-on: ${{ matrix.runs-on }} timeout-minutes: 60 steps: - name: Checkout From 4591ffaaf0e15f42473771055ff42a75362eed3a Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Tue, 1 Jul 2025 21:19:12 +0900 Subject: [PATCH 2/5] [ga] Bump actions/cache verstion to v4 because v2 is deprecated --- .github/workflows/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 4f7a856c..31c05971 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -206,7 +206,7 @@ jobs: id: brew-cache run: echo "::set-output name=dir::$(brew --cache)/downloads" - name: Brew cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.brew-cache.outputs.dir }} key: ${{ runner.os }}-${{ hashFiles('.github/workflows/Brewfile') }} From 5544cc0d18667b3cdfdacbaaefec1a9679121aca Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Tue, 1 Jul 2025 21:30:24 +0900 Subject: [PATCH 3/5] [ga/macos-14] since macos-14, we need to install GL/gl.h for mesalib-glw and X11 for xquartz --- .github/workflows/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 31c05971..c77fbcab 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -228,6 +228,8 @@ jobs: export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" # since macos-11, we need to install GL/gl.h HOMEBREW_NO_AUTO_UPDATE=1 brew install mesa-glu + # since macos-14, we need to install GL/gl.h for mesalib-glw and X11 for xquartz + HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw xquartz ./.travis-osx.sh - name: Cleanup some brew downloads run: cd ${{ steps.brew-cache.outputs.dir }} && ls -lsS | head -n 10 | awk '{ print $10 }' | xargs rm -rf From 8500c6ac6fbd77cea87df46845722497a9e19d90 Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Tue, 1 Jul 2025 21:36:14 +0900 Subject: [PATCH 4/5] [ga/macos-13] Add brew install jpeg --- .github/workflows/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index c77fbcab..9449738b 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -230,6 +230,8 @@ jobs: HOMEBREW_NO_AUTO_UPDATE=1 brew install mesa-glu # since macos-14, we need to install GL/gl.h for mesalib-glw and X11 for xquartz HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw xquartz + # since macos-13, we need to install jpeg + HOMEBREW_NO_AUTO_UPDATE=1 brew install jpeg ./.travis-osx.sh - name: Cleanup some brew downloads run: cd ${{ steps.brew-cache.outputs.dir }} && ls -lsS | head -n 10 | awk '{ print $10 }' | xargs rm -rf From 23db3ae098527de0f83b856f567118e77c9a3ddc Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Wed, 2 Jul 2025 12:06:12 +0900 Subject: [PATCH 5/5] [ga] Fixed catkin test (#2) --- .github/workflows/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 9449738b..9b9fac88 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -112,7 +112,9 @@ jobs: apt-get install -qq -y dpkg # necessary for catkin-pkg to be installable echo "Testing branch $GITHUB_REF of $GITHUB_REPOSITORY" sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list' - wget http://packages.ros.org/ros.key -O - | apt-key add - + # Replace the old apt-key add with the new method for adding the key + # https://github.com/ros/rosdistro/pull/46048 + curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add - apt-get update -qq apt-get install -qq -y python-catkin-tools python-rosdep apt-get install -qq -y build-essential git ros-melodic-rosbash ros-melodic-rospack