From 0352fe1fbde0115d12174d278f48f3bcfbaaf466 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Jan 2024 01:20:52 +0100 Subject: [PATCH] Don't set LD_LIBRARY_PATH for CI workflows This shouldn't be necessary any longer, after the fix in the grandparent commit. --- .circleci/config.yml | 2 -- .cirrus.yml | 2 -- .github/workflows/ci.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 085ac0b937..97e18fc671 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,8 +15,6 @@ jobs: - run: name: Install dependencies command: | - echo LD_LIBRARY_PATH=`pwd`/lib >> $BASH_ENV - # Do _not_ use the CPU count returned by build/tools/proc_count.sh # for building, it is too high (36 logical CPUs) and results in # running out of memory, so limit ourselves to just 2 CPUs we're diff --git a/.cirrus.yml b/.cirrus.yml index 95650861aa..932299091a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,8 +23,6 @@ task: arch: arm before_script: | - echo LD_LIBRARY_PATH=`pwd`/lib >> $CIRRUS_ENV - wxPROC_COUNT=`./build/tools/proc_count.sh` # ARM systems have 64 CPUs but run out of memory and crash when using that # many jobs, so limit them to something reasonable. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa6fefa267..196cd9017f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -197,8 +197,6 @@ jobs: - name: Set up build environment run: | - echo LD_LIBRARY_PATH=`pwd`/lib >> $GITHUB_ENV - wxPROC_COUNT=`./build/tools/proc_count.sh` echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $GITHUB_ENV