From 2d3139cab5890f0f7d9e0f9751e14ce4f755ae6e Mon Sep 17 00:00:00 2001 From: Mingbo Peng Date: Sat, 13 Sep 2025 14:27:20 -0400 Subject: [PATCH 1/2] ci: update path to Ironbug.Console in release workflow - Change the path to Ironbug.Console from 'linux-x64/net8/Ironbug.Console' to 'net8/linux-x64/Ironbug.Console' - This modification ensures compatibility with the latest build structure --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 031747b4..17337642 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -152,7 +152,7 @@ jobs: run: | echo "Test standalone console with sample model" cp "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/FourOfficeBuilding.osm" "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/test.osm" - ./src/Ironbug.Console/bin/Release/linux-x64/net8/Ironbug.Console "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/test.osm" "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/Sys01_PTAC_AllElec.json" + ./src/Ironbug.Console/bin/Release/net8/linux-x64/Ironbug.Console "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/test.osm" "./src/Ironbug.HVAC_Tests/TestSource/Integration Testing/Sys01_PTAC_AllElec.json" - name: Upload artifact uses: actions/upload-artifact@v4 From 518cecf57dd422eda107b9d7ffe8e9fc75db9613 Mon Sep 17 00:00:00 2001 From: Mingbo Peng Date: Sat, 13 Sep 2025 14:28:16 -0400 Subject: [PATCH 2/2] build: adjust directory paths and cleanup commands in Makefile - Update paths for Linux build output - Move cleanup commands for OpenStudio plugins to correct locations - Standardize directory structure in plugin folder --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1243ad10..0e82138f 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,17 @@ build-console-win: dotnet build ./src/Ironbug.Console/Ironbug.Console.csproj /p:Configuration=Release /p:Platform=x64 /p:Version=$(NEW_RELEASE_VERSION) /restore ls ./src/Ironbug.Console/bin/x64/Release/ 7z a -tzip ironbug.console.win.zip ./src/Ironbug.Console/bin/x64/Release - rm ./src/Ironbug.Console/bin/x64/Release/net48/openstudio* -r - rm ./src/Ironbug.Console/bin/x64/Release/net8/openstudio* -r - + cp ./src/Ironbug.Console/bin/x64/Release/net8/* installer/plugin cp ./src/Ironbug.Console/bin/x64/Release/net48/* installer/plugin/net48/ + rm ./installer/plugin/openstudio* -r + rm ./installer/plugin/net48/openstudio* -r 7z a -tzip installer/plugin/net48.zip ./installer/plugin/net48/* rm -r installer/plugin/net48 build-console-linux: dotnet build ./src/Ironbug.Console/Ironbug.Console.csproj -a x64 /p:Configuration=Release /p:TargetFramework=net8 /p:Version=$(NEW_RELEASE_VERSION) - ls ./src/Ironbug.Console/bin/Release/linux-x64/net8 - zip -r ironbug.console.linux.zip ./src/Ironbug.Console/bin/Release/linux-x64/net8 + ls ./src/Ironbug.Console/bin/Release/net8/linux-x64 + zip -r ironbug.console.linux.zip ./src/Ironbug.Console/bin/Release/net8/linux-x64