diff options
author | Xenhat Hex | 2023-05-22 19:22:42 -0400 |
---|---|---|
committer | Xenhat Hex | 2023-05-22 19:22:42 -0400 |
commit | c0924355b490b03627d9da62b8018243b386bf12 (patch) | |
tree | 80d8acc1f3cde6a0f47b516fa49e4b8a9f9b0819 | |
parent | 9037e8a3275d39faea46eae1b0284e4a94e86857 (diff) | |
download | aur-c0924355b490b03627d9da62b8018243b386bf12.tar.gz |
cleanup
-rwxr-xr-x | ci.bash | 21 | ||||
-rwxr-xr-x | compile.bash | 127 |
2 files changed, 0 insertions, 148 deletions
diff --git a/ci.bash b/ci.bash deleted file mode 100755 index 63bea6407507..000000000000 --- a/ci.bash +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -#git clean -dfX -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" -cd "${DIR}" || return - -# Pull the aur repository first -git reset --hard HEAD -git pull - -# Weird pgrep fail with the complete binary name -#if pgrep -a do-not-directly|grep alchemy ; then -# echo "Aborting package build because Alchemy is running" -# exit 0 -#fi -makepkg --sync --needed --noconfirm diff --git a/compile.bash b/compile.bash deleted file mode 100755 index 8817494fcd2e..000000000000 --- a/compile.bash +++ /dev/null @@ -1,127 +0,0 @@ -#!/usr/bin/env bash -set -e - -if command -v schedtool >/dev/null 2>&1; then - # Set current shell and all descendents as SCHED_BATCH, see schedtool(8) - schedtool -B $$ - prefix_cmd='schedtool -B -n20 -e ' -fi - -venv() { - virtualenv ".venv" -p python3 - . ".venv/bin/activate" -} - -prepare() { - if [[ -n "$USE_VENV" ]]; then - venv - fi - - echo "Installing build toolchain..." - pip3 install --upgrade certifi --quiet - pip3 install --upgrade llbase --quiet - pip3 install --no-cache --upgrade autobuild --quiet - pip3 install --upgrade cmake ninja -} - -build() { - # we have a lot of files, relax ulimit to help performance - if [[ -n "$USE_VENV" ]]; then - . ".venv/bin/activate" - fi - set +e - ulimit -n 20000 - set -e - build_jobs=$(nproc) - if [[ -z "$NO_SMART_JOB_COUNT" ]]; then - if [[ ${build_jobs} -gt 1 ]]; then - jobs=1 - # The viewer requires an average of 2GB of memory per core to link - # Note: Behaviour change compared to the previous versions: - # This script will no longer try to allocate build memory into swap - # This is bad practice, and swap should be reserved to evict process - # memory from physical ram to make place for the current workset. - # This script will now try to check if swap is present and sufficent - # for the current used memory to be stored in swap before allocating, - # and will fallback to conservative allocation if swap is not available - gigperlinkprocess=2 - mempercorekb=$((gigperlinkprocess * 1048576)) - requiredmemorykb=$(($(nproc) * mempercorekb)) - free_output="$(free --kilo --total | tail -n+2 | tr -s ' ')" - physical_output=$(grep "Mem:" <<<"$free_output") - #total_output=$(grep Total: <<< "$free_output") - usedmemorykbphysical=$(cut -d ' ' -f 3 <<<"$physical_output") - totalmemorykbphysical=$(cut -d ' ' -f 2 <<<"$physical_output") - swap_output=$(grep Swap: <<<"$free_output") - # Determine available swap space - availableswapkb=0 - if [[ -n "$swap_output" ]]; then - availableswapkb=$(cut -d ' ' -f 4 <<<"$swap_output") - fi - availablememorykbphysical=$(cut -d ' ' -f 7 <<<"$free_output") - echo "Total memory: $totalmemorykbphysical (includes swap)" - echo "Available memory: $availablememorykbphysical" - echo "Required memory: $requiredmemorykb" - echo "Available physical memory on this system: $((availablememorykbphysical / 1024 / 1024)) GB" - echo "Estimated required memory to build with all cores: $((requiredmemorykb / 1024 / 1024)) GB" - if [[ ${requiredmemorykb} -gt ${availablememorykbphysical} ]]; then - echo "Warning: Not enough available physical memory to build with all cores" - if [[ ${usedmemorykbphysical} -lt ${availableswapkb} ]]; then - # use all physical ram as swap will do its job - echo "There is enough free swap to store the currently used memory" - jobs=$(((totalmemorykbphysical / 1024 / 1024) / gigperlinkprocess)) - else - # Not enough swap to hold ram contents, calculate manually - echo "Allocating build jobs according to available physical memory ("$((availablememorykbphysical / 1024 / 1024))"/"$((requiredmemorykb / 1024 / 1024))"GB)..." - # FIXME: Goes one iteration beyond what it should - while [[ $((jobs * mempercorekb)) -lt ${availablememorykbphysical} ]]; do - jobs=$((jobs + 1)) - echo -e "${jobs} jobs would consume $(((jobs * mempercorekb) / 1024 / 1024))GB" - done - # Back off one job count. Not sure why I have to do this but - # the loop is doing one extra iteration. - jobs=$((jobs - 1)) - fi - build_jobs=${jobs} - echo "Computed job count: ${build_jobs}" - fi - fi - fi - export AUTOBUILD_CPU_COUNT=$build_jobs - AL_CMAKE_CONFIG=( - -DLL_TESTS:BOOL=ON - -DDISABLE_FATAL_WARNINGS=ON - -DUSE_LTO:BOOL=OFF - -DVIEWER_CHANNEL="Alchemy Test" - ) - # I could not find the documentation on how to handle BUILDENV/OPTION in - # makepkg.conf. If you are reading this and know where it is, - # please send it my way. - # if [[ -n "$AL_NO_CCACHE" ]] || ! command -v ccache 2 > /dev/null 2>&1; then - # echo "ccache disabled" - # AL_CMAKE_CONFIG+=(-UCMAKE_CXX_COMPILER_LAUNCHER) - # else - # echo "ccache available and enabled" - # export CCACHE_SLOPPINESS="file_macro,locale,time_macros" - # export CCACHE_NOHASHDIR="true" - # AL_CMAKE_CONFIG+=(-DCMAKE_CXX_COMPILER_LAUNCHER=ccache) - # fi - $prefix_cmd autobuild configure -A 64 -c ReleaseOS -- "${AL_CMAKE_CONFIG[@]}" - echo "Building with ${AUTOBUILD_CPU_COUNT} jobs (adjusted)" - $prefix_cmd autobuild build -A64 -c ReleaseOS --no-configure -} - -cleanbuild() { - rm -rf build-linux-64 - git pull --prune - build -} -if [[ -n "$1" ]]; then - $1 -else - echo "Running unattended batch build..." - prepare - build -fi - -# vi: set ai softtabstop=2 shiftwidth=2 tabstop=2 expandtab: |