Skip to content

Commit f595046

Browse files
authored
ci: Fixed issues with building debug locally (#1630)
1 parent fea6bc3 commit f595046

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

build/build.ps1

-14
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Param(
99
[ValidateSet("All","x64","x86")][string]$Architecture = "All",
1010
[string]$HomePath = "$env:NR_DEV_HOMEROOT",
1111
[string]$gpgKeyPath = "",
12-
[switch]$SkipProfilerBuild = $false,
1312
[switch]$KeepNewRelicConfig = $false,
1413
[switch]$SetSystemEnvironment = $false,
1514
[switch]$SetSessionEnvironment = $false
@@ -38,19 +37,6 @@ if (($Type -like "Linux" -or $Type -like "All" -or $Type -like "CoreAll" -or $Ty
3837
. "$rootDirectory\build\build_functions.ps1"
3938
$HomePath = Get-HomeRootPath $HomePath
4039

41-
######################################
42-
# Profiler Build (Windows and Linux) #
43-
######################################
44-
45-
if (-Not $SkipProfilerBuild) {
46-
$profilerBuildScript = "$rootDirectory\src\Agent\NewRelic\Profiler\build\build.ps1"
47-
& $profilerBuildScript
48-
if ($LastExitCode -ne 0) {
49-
Write-Host "Error in Profiler build script. Exiting with code: $LastExitCode.."
50-
exit $LastExitCode
51-
}
52-
}
53-
5440
#######################
5541
# Managed Agent Build #
5642
#######################

build/build_functions.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ function Copy-AgentRoot {
156156

157157
if ($Linux) {
158158
if ($Architecture -like "x64") {
159-
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\Release\netstandard2.0\profiler\linux_x64\libNewRelicProfiler.so" -Destination "$Destination" -Force
159+
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\$Configuration\netstandard2.0\profiler\linux_x64\libNewRelicProfiler.so" -Destination "$Destination" -Force
160160
}
161161
if ($Architecture -like "ARM64") {
162-
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\Release\netstandard2.0\profiler\linux_arm64\libNewRelicProfiler.so" -Destination "$Destination" -Force
162+
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\$Configuration\netstandard2.0\profiler\linux_arm64\libNewRelicProfiler.so" -Destination "$Destination" -Force
163163
}
164164
}
165165
else {
@@ -170,10 +170,10 @@ function Copy-AgentRoot {
170170
}
171171

172172
if ($Architecture -like "x64" ) {
173-
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\Release\netstandard2.0\profiler\x64\NewRelic.Profiler.dll" -Destination "$Destination" -Force
173+
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\$Configuration\netstandard2.0\profiler\x64\NewRelic.Profiler.dll" -Destination "$Destination" -Force
174174
}
175175
else {
176-
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\Release\netstandard2.0\profiler\x86\NewRelic.Profiler.dll" -Destination "$Destination" -Force
176+
Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Home\bin\$Configuration\netstandard2.0\profiler\x86\NewRelic.Profiler.dll" -Destination "$Destination" -Force
177177
}
178178
}
179179

0 commit comments

Comments
 (0)