Merge remote-tracking branch 'origin/sdf9' into azeey/9_to_12

gazebosim · Nov 14, 2023 · 7ab0cb8 · 7ab0cb8
2 parents 1a484c0 + a88ac4d
commit 7ab0cb8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,14 +1,19 @@
 name: Ubuntu
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'sdf[0-9]?'
+      - 'main'
 
 jobs:
   bionic-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Bionic CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: ignition-tooling/action-ignition-ci@bionic
@@ -17,7 +22,7 @@ jobs:
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: ignition-tooling/action-ignition-ci@focal

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -10,10 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add ticket to inbox
-        uses: technote-space/create-project-card-action@v1
+        uses: actions/[email protected]
         with:
-          PROJECT: Core development
-          COLUMN: Inbox
-          GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
-          CHECK_ORG_PROJECT: true
-
+          project-url: https://github.com/orgs/gazebosim/projects/7
+          github-token: ${{ secrets.TRIAGE_TOKEN }}