From ae61c17493c3212e3e4fd81110c396940875a150 Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Thu, 12 Oct 2023 00:40:38 -0700 Subject: [PATCH] Testing pipelines --- .github/workflows/ci.yaml | 5 +---- .github/workflows/docker.yaml | 11 +++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e4c3bb7..59e65ad5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - 120-feature-cleanup-dockerfile pull_request: workflow_dispatch: @@ -21,10 +22,6 @@ jobs: env: - IMAGE: rolling-ci ROS_DISTRO: rolling - - IMAGE: iron-ci - ROS_DISTRO: iron - - IMAGE: humble-ci - ROS_DISTRO: humble steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 485e7cf2..1153e01d 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,10 +6,13 @@ on: push: branches: - main + - 120-feature-cleanup-dockerfile pull_request: paths: - .docker/** - .github/workflows/docker.yaml + - blue.repos + - requirements-build.txt workflow_dispatch: env: @@ -20,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [humble, iron, rolling] + ROS_DISTRO: [rolling] runs-on: ubuntu-latest permissions: packages: write @@ -60,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [humble, rolling, iron] + ROS_DISTRO: [rolling] runs-on: ubuntu-latest permissions: packages: write @@ -107,7 +110,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [humble, iron, rolling] + ROS_DISTRO: [rolling] runs-on: ubuntu-latest permissions: packages: write @@ -147,7 +150,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [humble, iron, rolling] + ROS_DISTRO: [rolling] runs-on: ubuntu-latest permissions: packages: write