Skip to content
Merged

Dev #148

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +21 to +22

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The -r flag for rm should be placed before the file path arguments. Placing it at the end is not standard and may cause the command to fail, for example if it tries to remove a file named -r.

To make the script more robust, I also suggest adding the -f (force) flag. This will prevent the script from failing if no files match the openstudio* pattern. The -rf combination is a common idiom for this purpose.

	rm -rf ./installer/plugin/openstudio*
	rm -rf ./installer/plugin/net48/openstudio*


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

Loading