Commit 0e7134f3 authored by Hannah von Reth's avatar Hannah von Reth

Craft: Fix case

parent 3d34b495
...@@ -36,7 +36,7 @@ timestamps { ...@@ -36,7 +36,7 @@ timestamps {
// Update Craft itself // Update Craft itself
sh """ sh """
cd ~/Craft/BinaryFactory/ cd ~/Craft/BinaryFactory/
python3 craftmaster/Craftmaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c -i craft python3 craftmaster/CraftMaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c -i craft
""" """
} }
...@@ -44,7 +44,7 @@ timestamps { ...@@ -44,7 +44,7 @@ timestamps {
// Ask Craftmaster to ensure all the dependencies are installed for this application we are going to be building // Ask Craftmaster to ensure all the dependencies are installed for this application we are going to be building
sh """ sh """
cd ~/Craft/BinaryFactory/ cd ~/Craft/BinaryFactory/
python3 craftmaster/Craftmaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} ${craftProjectParams} --install-deps ${craftBuildBlueprint} python3 craftmaster/CraftMaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} ${craftProjectParams} --install-deps ${craftBuildBlueprint}
""" """
} }
...@@ -52,7 +52,7 @@ timestamps { ...@@ -52,7 +52,7 @@ timestamps {
// Actually build the application now // Actually build the application now
sh """ sh """
cd ~/Craft/BinaryFactory/ cd ~/Craft/BinaryFactory/
python3 craftmaster/Craftmaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} --no-cache ${craftProjectParams} ${craftRebuildBlueprint} python3 craftmaster/CraftMaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} --no-cache ${craftProjectParams} ${craftRebuildBlueprint}
""" """
} }
...@@ -61,14 +61,14 @@ timestamps { ...@@ -61,14 +61,14 @@ timestamps {
sh """ sh """
cd ~/Craft/BinaryFactory/ cd ~/Craft/BinaryFactory/
// If Craft knew how to generate Appimages we could just run the below... // If Craft knew how to generate Appimages we could just run the below...
//python3 craftmaster/Craftmaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} ${craftProjectParams} --package ${craftBuildBlueprint} //python3 craftmaster/CraftMaster.py --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} ${craftProjectParams} --package ${craftBuildBlueprint}
// Instead we'll have to ask Craft to stage all the resources like it normally would, then we can run the necessary external tools to generate the appimage // Instead we'll have to ask Craft to stage all the resources like it normally would, then we can run the necessary external tools to generate the appimage
""" """
// Now copy it to the Jenkins workspace so it can be grabbed from there // Now copy it to the Jenkins workspace so it can be grabbed from there
sh """ sh """
cd ~/Craft/BinaryFactory/ cd ~/Craft/BinaryFactory/
packageDir=\$(python3 "craftmaster/Craftmaster.py" --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} -q --get "packageDestinationDir()" virtual/base) packageDir=\$(python3 "craftmaster/CraftMaster.py" --config "${craftmasterConfig}" --target ${craftPlatform} -c ${craftOptions} -q --get "packageDestinationDir()" virtual/base)
cp -vf \$packageDir/* \$WORKSPACE/ cp -vf \$packageDir/* \$WORKSPACE/
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment