From 32d8329858d11cabd33c2b5c518b8a6ca7c1a5de Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 10:17:40 -0600 Subject: [PATCH 1/5] Update github action workflows (#388) * Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 12 +++++++++--- .github/workflows/triage.yml | 9 +++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 744bfcff..302135fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-fuel-tools[0-9]' + - 'gz-fuel-tools[0-9]?' + - 'main' jobs: bionic-ci: @@ -8,7 +14,7 @@ jobs: 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 @@ -19,7 +25,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 index 736670e0..2332244b 100644 --- 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/add-to-project@v0.5.0 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 }} From 0965ad084a60ebe089901d61763d8ca3b159e809 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 20:54:28 -0600 Subject: [PATCH 2/5] Update github action workflows (#388) (#390) * Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 12 +++++++++--- .github/workflows/triage.yml | 9 +++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8faf5307..510ba250 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-fuel-tools[0-9]' + - 'gz-fuel-tools[0-9]?' + - 'main' jobs: bionic-ci: @@ -8,7 +14,7 @@ jobs: 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 @@ -19,7 +25,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 index 736670e0..2332244b 100644 --- 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/add-to-project@v0.5.0 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 }} From ed334c98cf87b30f24a1f7dc77de2f9e42c13349 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 27 Nov 2023 08:05:52 -0600 Subject: [PATCH 3/5] Disable tests that are known to fail on Windows (#387) Windows doesn't support colon or at-symbol in paths. This disables the tests on gz-fuel-tools8, as we want to preserve the behavior (to not invalidate anyone's current cache). On gz-fuel-tools9 forward, the fix is implemented. Do not forward port these changes Signed-off-by: Michael Carroll --- src/FuelClient_TEST.cc | 10 +++++++--- src/gz_src_TEST.cc | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index ce4c462e..dcaa65e0 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -1149,7 +1149,8 @@ TEST_F(FuelClientTest, DownloadWorld) ///////////////////////////////////////////////// // Windows doesn't support colons in filenames // https://github.com/gazebosim/gz-fuel-tools/issues/106 -TEST_F(FuelClientTest, CachedWorld) +// This is fixed in gz-fuel-tools9+, but not here to preserve behavior +TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(CachedWorld)) { ClientConfig config; config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache")); @@ -1477,8 +1478,11 @@ TEST_F(FuelClientTest, UploadModelFail) EXPECT_EQ(ResultType::UPLOAD_ERROR, result.Type()); } -////////////////////////////////////////////////// -TEST_F(FuelClientTest, PatchModelFail) +///////////////////////////////////////////////// +// Windows doesn't support colons in filenames +// https://github.com/gazebosim/gz-fuel-tools/issues/106 +// This is fixed in gz-fuel-tools9+, but not here to preserve behavior +TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(PatchModelFail)) { FuelClient client; ModelIdentifier modelId; diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 082fae62..1aa1428e 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -51,6 +51,10 @@ class CmdLine : public ::testing::Test // instead of on teardown leaves the folder intact for debugging if needed common::removeAll(testCachePath); ASSERT_TRUE(common::createDirectories(testCachePath)); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.gazebosim.org"))); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.ignitionrobotics.org"))); setenv("GZ_FUEL_CACHE_PATH", this->testCachePath.c_str(), true); } From b80abc32624ce351611aca46d49ad71e0ed6a0a4 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 11 Dec 2023 11:37:40 -0600 Subject: [PATCH 4/5] Create directories and more output on fail (#392) Signed-off-by: Michael Carroll --- src/gz_src_TEST.cc | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 1ca4e8f9..8b41291c 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -51,6 +51,11 @@ class CmdLine : public ::testing::Test // instead of on teardown leaves the folder intact for debugging if needed common::removeAll(testCachePath); ASSERT_TRUE(common::createDirectories(testCachePath)); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.gazebosim.org"))); + ASSERT_TRUE(common::createDirectories( + common::joinPaths(testCachePath, "fuel.ignitionrobotics.org"))); + setenv("IGN_FUEL_CACHE_PATH", this->testCachePath.c_str(), true); } @@ -85,7 +90,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(); } ///////////////////////////////////////////////// @@ -397,10 +402,10 @@ TEST_P(DownloadCollectionTest, AllItems) "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2"))); + "openrobotics", "models", "backpack", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2", "model.sdf"))); + "openrobotics", "models", "backpack", "3", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( @@ -408,10 +413,10 @@ TEST_P(DownloadCollectionTest, AllItems) "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2"))); + "openrobotics", "models", "teambase", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2", "model.sdf"))); + "openrobotics", "models", "teambase", "3", "model.sdf"))); // World: Test World EXPECT_TRUE(common::isDirectory( @@ -460,10 +465,10 @@ TEST_P(DownloadCollectionTest, Models) "openrobotics", "models", "backpack"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2"))); + "openrobotics", "models", "backpack", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "backpack", "2", "model.sdf"))); + "openrobotics", "models", "backpack", "3", "model.sdf"))); // Model: TEAMBASE EXPECT_TRUE(common::isDirectory( @@ -471,10 +476,10 @@ TEST_P(DownloadCollectionTest, Models) "openrobotics", "models", "teambase"))); EXPECT_TRUE(common::isDirectory( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2"))); + "openrobotics", "models", "teambase", "3"))); EXPECT_TRUE(common::isFile( common::joinPaths(this->testCachePath, "fuel.gazebosim.org", - "openrobotics", "models", "teambase", "2", "model.sdf"))); + "openrobotics", "models", "teambase", "3", "model.sdf"))); // World: Test World EXPECT_FALSE(common::isDirectory( From 931f139b00e37fe764ee05a5ec40e695c1c323af Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 5 Jan 2024 16:22:58 -0600 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=88=204.9.1=20(#398)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Carroll --- CMakeLists.txt | 2 +- Changelog.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5976f84..65072a9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-fuel_tools4 VERSION 4.9.0) +project(ignition-fuel_tools4 VERSION 4.9.1) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index 8816bc6f..3352883e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,16 @@ ## Gazebo Fuel Tools 4.x +### 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