From 50ab788fe03982eaa7b6ac63d940c9cea3a3b8c4 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Tue, 9 Jan 2024 13:46:48 +0100 Subject: [PATCH 1/4] branchwise workflow --- .github/workflows/melodic.yml | 12 ++++++++++-- .github/workflows/noetic.yml | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml index 5a5dbd0..1719ec3 100644 --- a/.github/workflows/melodic.yml +++ b/.github/workflows/melodic.yml @@ -1,7 +1,15 @@ name: Melodic CI -on: [push, pull_request] - +on: + push: + branches: + - 'melodic' + pull_request: + branches: + - 'melodic' + workflow_dispatch: + branches: + - '*' jobs: industrial_ci: strategy: diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml index 22c221d..64935a5 100644 --- a/.github/workflows/noetic.yml +++ b/.github/workflows/noetic.yml @@ -1,7 +1,18 @@ name: Noetic CI -on: [push, pull_request] - +name: core-ubu20 +on: + push: + branches: + - 'main' + - 'noetic' + pull_request: + branches: + - 'main' + - 'noetic' + workflow_dispatch: + branches: + - '*' jobs: industrial_ci: strategy: From f39052a31cf769adf84947d14883f7e92ce2b821 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Fri, 19 Jan 2024 01:13:57 +0100 Subject: [PATCH 2/4] specified ubuntu versions. added humble ci --- .github/workflows/humble.yml | 25 +++++++++++++++++++++++++ .github/workflows/melodic.yml | 3 +-- .github/workflows/noetic.yml | 4 +--- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/humble.yml diff --git a/.github/workflows/humble.yml b/.github/workflows/humble.yml new file mode 100644 index 0000000..7e4a232 --- /dev/null +++ b/.github/workflows/humble.yml @@ -0,0 +1,25 @@ +name: Humble CI +on: + push: + branches: + - 'humble' + pull_request: + branches: + - 'humble' + workflow_dispatch: + branches: + - '*' +jobs: + industrial_ci: + strategy: + matrix: + env: + - {ROS_DISTRO: humble, ROS_REPO: testing} + - {ROS_DISTRO: humble, ROS_REPO: main} + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: 'ros-industrial/industrial_ci@master' + env: ${{matrix.env}} diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml index 1719ec3..5c876e8 100644 --- a/.github/workflows/melodic.yml +++ b/.github/workflows/melodic.yml @@ -1,5 +1,4 @@ name: Melodic CI - on: push: branches: @@ -17,7 +16,7 @@ jobs: env: - {ROS_DISTRO: melodic, ROS_REPO: testing} - {ROS_DISTRO: melodic, ROS_REPO: main} - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml index 64935a5..6eb613a 100644 --- a/.github/workflows/noetic.yml +++ b/.github/workflows/noetic.yml @@ -1,6 +1,4 @@ name: Noetic CI - -name: core-ubu20 on: push: branches: @@ -20,7 +18,7 @@ jobs: env: - {ROS_DISTRO: noetic, ROS_REPO: testing} - {ROS_DISTRO: noetic, ROS_REPO: main} - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 with: From 27179a2dee9a3386ee8611c339d1413b139ef7ea Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Fri, 19 Jan 2024 09:50:54 +0100 Subject: [PATCH 3/4] main -> master --- .github/workflows/noetic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml index 6eb613a..9681ad7 100644 --- a/.github/workflows/noetic.yml +++ b/.github/workflows/noetic.yml @@ -2,11 +2,11 @@ name: Noetic CI on: push: branches: - - 'main' + - 'master' - 'noetic' pull_request: branches: - - 'main' + - 'master' - 'noetic' workflow_dispatch: branches: From 6e5b1584118beb3118413b34019c48eca73575b5 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Fri, 19 Jan 2024 14:33:24 +0100 Subject: [PATCH 4/4] removed humble and melodic pipeline. noetic pipeline remains and is only triggered for noetic and master branch --- .github/workflows/humble.yml | 25 ------------------------- .github/workflows/melodic.yml | 25 ------------------------- 2 files changed, 50 deletions(-) delete mode 100644 .github/workflows/humble.yml delete mode 100644 .github/workflows/melodic.yml diff --git a/.github/workflows/humble.yml b/.github/workflows/humble.yml deleted file mode 100644 index 7e4a232..0000000 --- a/.github/workflows/humble.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Humble CI -on: - push: - branches: - - 'humble' - pull_request: - branches: - - 'humble' - workflow_dispatch: - branches: - - '*' -jobs: - industrial_ci: - strategy: - matrix: - env: - - {ROS_DISTRO: humble, ROS_REPO: testing} - - {ROS_DISTRO: humble, ROS_REPO: main} - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml deleted file mode 100644 index 5c876e8..0000000 --- a/.github/workflows/melodic.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Melodic CI -on: - push: - branches: - - 'melodic' - pull_request: - branches: - - 'melodic' - workflow_dispatch: - branches: - - '*' -jobs: - industrial_ci: - strategy: - matrix: - env: - - {ROS_DISTRO: melodic, ROS_REPO: testing} - - {ROS_DISTRO: melodic, ROS_REPO: main} - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}}