Skip to content

chore: adapt safety for older archs #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 8, 2024
Merged

chore: adapt safety for older archs #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f8e9393
chore: remove safety for older archs
kmruiz Jul 4, 2024
a2ab3f2
chore: revert
kmruiz Jul 4, 2024
7dee2b4
Merge branch 'main' into chore/fix-ci-for-cortex-arch
kmruiz Jul 4, 2024
f0dc1e3
chore: patch only non-leaf, rollback behaviour
kmruiz Jul 4, 2024
25e406a
chore: specify target arch
kmruiz Jul 4, 2024
2e7c9dc
chore: typo
kmruiz Jul 4, 2024
b903c08
chore: try only with the arch limitation
kmruiz Jul 5, 2024
7ee9d2b
chore: try force mcpu too
kmruiz Jul 5, 2024
a2abe07
chore: typo, it uses a dash not a underscore
kmruiz Jul 5, 2024
b1d2d5e
chore: try to make it work for cortex a53
kmruiz Jul 5, 2024
ae69885
chore: try to fix patch
kmruiz Jul 5, 2024
e084116
chore: downgrade toolchain, might not be necessary
kmruiz Jul 8, 2024
ed764d8
chore: add v3 toolchain
kmruiz Jul 8, 2024
ff49f6a
chore: setup PATH
kmruiz Jul 8, 2024
a5d735a
Merge branch 'main' into chore/fix-ci-for-cortex-arch
kmruiz Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .evergreen/install-node-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@ EVGDIR="$ROOT_DIR/.evergreen"
NVM_DIR="$EVGDIR/.nvm"
ORIGINAL_PATH="${PATH}"

OS_ARCH="$(uname "-m")"

if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
else
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
fi

export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
export CC=gcc
export CXX=g++

Expand Down
13 changes: 2 additions & 11 deletions .evergreen/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
set -e
set -x

OS_ARCH="$(uname "-m")"

if [ "$OS_ARCH" = "aarch64" ] || [ "$OS_ARCH" = "arm64" ] ; then
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
else
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
fi

export BASEDIR="$PWD/.evergreen"
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:$TOOLCHAIN_PATH:$PATH"
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-10/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH"

export IS_MONGOSH_EVERGREEN_CI=1
export DEBUG="mongodb*,$DEBUG"

Expand Down