Skip to content

Commit

Permalink
Merge pull request #599 from gazebosim/azeey/3_to_6
Browse files Browse the repository at this point in the history
Merge ign-gui3 ➡️  ign-gui6
  • Loading branch information
azeey authored Nov 14, 2023
2 parents 196edbc + 6bde711 commit 36b8812
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Ubuntu CI

on: [push, pull_request]
on:
pull_request:
push:
branches:
- 'ign-gui[0-9]'
- 'gz-gui[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
Expand All @@ -20,7 +26,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
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

0 comments on commit 36b8812

Please sign in to comment.