Merge pull request #122 from azeey/1_to_2

Merge ign-util1 ➡️ gz-utils2
gazebosim · Jan 19, 2024 · 7ae18c9 · 7ae18c9
2 parents a6c9465 + 510b694
commit 7ae18c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,14 +1,20 @@
 name: Ubuntu CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ign-utils[0-9]'
+      - 'gz-utils[0-9]'
+      - 'main'
 
 jobs:
   focal-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal
@@ -21,7 +27,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@ jobs:
		with:
		project-url: https://github.com/orgs/gazebosim/projects/7
		github-token: ${{ secrets.TRIAGE_TOKEN }}