diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 6d0f8f3bd6..2a55ac6a75 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -66,13 +66,12 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - ${{ if contains(parameters.pool.vmImage, 'macOS') }}: + - script: | + brew update + brew install libomp + brew link libomp --force displayName: Install MacOS build dependencies - # Extra Apple MacOS step required to install OS-specific dependencies - - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - - script: brew update && brew install -f --overwrite python@3.13 && brew install libomp && brew link libomp --force - displayName: Install MacOS ARM build dependencies - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index a7ccf2f8cd..616d6b1dc3 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -142,7 +142,10 @@ extends: PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets ArtifactName: pkgassets steps: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: | + brew update + brew install libomp + brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true diff --git a/eng/helix.proj b/eng/helix.proj index c9289ad011..71cd4fb2aa 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -111,6 +111,9 @@ $(HelixPreCommands);export LD_LIBRARY_PATH=/opt/homebrew/opt/mono-libgdiplus/lib;ls /usr/lib;ls $HELIX_WORKITEM_ROOT;export KMP_DUPLICATE_LIB_OK=TRUE;otool -L $HELIX_WORKITEM_ROOT/runtimes/osx-x64/native/lib_lightgbm.dylib + + $(HelixPreCommands);export DYLD_LIBRARY_PATH=$HELIX_WORKITEM_ROOT:$DYLD_LIBRARY_PATH;export DYLD_FALLBACK_LIBRARY_PATH=$HELIX_WORKITEM_ROOT:$DYLD_FALLBACK_LIBRARY_PATH + $(HelixPreCommands);sudo apt update;sudo apt-get install libomp-dev libomp5 -y $HELIX_CORRELATION_PAYLOAD @@ -119,11 +122,10 @@ runTests.sh .\runTests.cmd - /usr/local/opt/libomp/lib/libiomp5.dylib;/usr/local/opt/libomp/lib/libomp.dylib; - /usr/local/opt/libomp/lib/libomp.dylib; + /usr/local/opt/libomp/lib/libomp.dylib; - + + @@ -141,6 +144,10 @@ + + +