Skip to content

Commit

Permalink
Merge 7 into 8
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
  • Loading branch information
azeey committed Jan 18, 2024
2 parents ed334c9 + 9314076 commit 2c84439
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 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-fuel-tools[0-9]'
- 'gz-fuel-tools[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
Expand All @@ -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
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
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 }}

11 changes: 11 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,17 @@
1. Support link referral download
* [Pull request #333](https://github.com/gazebosim/gz-fuel-tools/pull/333)

### Gazebo Fuel Tools 4.9.1 (2024-01-05)

1. Create directories and more output on fail
* [Pull request #392](https://github.com/gazebosim/gz-fuel-tools/pull/392)

1. Update github action workflows
* [Pull request #388](https://github.com/gazebosim/gz-fuel-tools/pull/388)

1. Zip: use non-deprecated methods
* [Pull request #360](https://github.com/gazebosim/gz-fuel-tools/pull/360)

### Gazebo Fuel Tools 4.9.0 (2023-05-03)

1. Add bash completion
Expand Down
2 changes: 1 addition & 1 deletion src/gz_src_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TEST_F(CmdLine, ModelListFail)

EXPECT_NE(this->stdOutBuffer.str().find("Invalid URL"),
std::string::npos) << this->stdOutBuffer.str();
EXPECT_TRUE(this->stdErrBuffer.str().empty());
EXPECT_TRUE(this->stdErrBuffer.str().empty()) << this->stdErrBuffer.str();
}

/////////////////////////////////////////////////
Expand Down

0 comments on commit 2c84439

Please sign in to comment.