From 38fc03cc3bf1a005180f7a8d6d9f6fedd0f86a65 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 24 Jun 2024 13:51:50 +0200 Subject: [PATCH] COIN: Do not specify full path to 7zip It is in the PATH, and the full path makes changing platforms/VMs harder (like updating to ARM Macs) Change-Id: I3b4a3208aa066e8000321d6a548b9559c249dc5e Reviewed-by: Eike Ziller --- coin/instructions/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 23ec37b4d6c..b98cfbafbcc 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -20,7 +20,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download elfutils package, check logs." - type: ExecuteCommand - command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils" + command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract elfutils package, check logs." @@ -30,7 +30,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download LLVM package, check logs." - type: ExecuteCommand - command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/" + command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract LLVM package, check logs." @@ -64,7 +64,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download LLVM package, check logs." - type: ExecuteCommand - command: "/usr/local/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/" + command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract LLVM package, check logs." @@ -96,7 +96,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download elfutils package, check logs." - type: ExecuteCommand - command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils" + command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract elfutils package, check logs." @@ -106,7 +106,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download python package, check logs." - type: ExecuteCommand - command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python" + command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract python package, check logs." @@ -116,7 +116,7 @@ instructions: maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to download LLVM package, check logs." - type: ExecuteCommand - command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\" + command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\" maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 userMessageOnFailure: "Failed to extract LLVM package, check logs."