Lock down yarn version for local repo (currently 1.13.0)
This commit is contained in:
parent
04f6782f1d
commit
3437982f70
|
@ -150,3 +150,4 @@ logger_settings.ini
|
||||||
conan*.txt
|
conan*.txt
|
||||||
conanbuildinfo.*
|
conanbuildinfo.*
|
||||||
conan.cmake
|
conan.cmake
|
||||||
|
/yarn-error.log
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,6 @@
|
||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# yarn lockfile v1
|
||||||
|
|
||||||
|
|
||||||
|
lastUpdateCheck 1547116152734
|
||||||
|
yarn-path ".yarn/releases/yarn-1.13.0.js"
|
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get -q -y --no-install-recommends install curl softwar
|
||||||
libx11-xcb1 libxss1 libasound2 libgl-dev libsm6 libxrandr2 python-dev \
|
libx11-xcb1 libxss1 libasound2 libgl-dev libsm6 libxrandr2 python-dev \
|
||||||
libjasper-dev libegl1-mesa libxcomposite-dev libxcursor-dev && \
|
libjasper-dev libegl1-mesa libxcomposite-dev libxcursor-dev && \
|
||||||
locale-gen en_US.UTF-8 && \
|
locale-gen en_US.UTF-8 && \
|
||||||
npm install -g yarn@1.12.3 && \
|
npm install -g yarn@1.13.0 && \
|
||||||
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man
|
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man
|
||||||
|
|
||||||
RUN cd /tmp && wget -q https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.tar.gz && \
|
RUN cd /tmp && wget -q https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.tar.gz && \
|
||||||
|
|
|
@ -27,7 +27,7 @@ RUN apt-get update && apt-get -q -y --no-install-recommends install curl softwar
|
||||||
libx11-xcb1 libxss1 libasound2 libgl-dev libsm6 libxrandr2 python-dev \
|
libx11-xcb1 libxss1 libasound2 libgl-dev libsm6 libxrandr2 python-dev \
|
||||||
libjasper-dev libegl1-mesa libxcomposite-dev libxcursor-dev && \
|
libjasper-dev libegl1-mesa libxcomposite-dev libxcursor-dev && \
|
||||||
locale-gen en_US.UTF-8 && \
|
locale-gen en_US.UTF-8 && \
|
||||||
npm install -g yarn@1.12.3 && \
|
npm install -g yarn@1.13.0 && \
|
||||||
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man && \
|
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man && \
|
||||||
python3 -m pip install --upgrade pip && \
|
python3 -m pip install --upgrade pip && \
|
||||||
pip3 install conan==1.9.0
|
pip3 install conan==1.9.0
|
||||||
|
|
|
@ -70,7 +70,7 @@ RUN mkdir -p $LEIN_INSTALL \
|
||||||
# Install React-Native
|
# Install React-Native
|
||||||
RUN npm install -g react-native-cli
|
RUN npm install -g react-native-cli
|
||||||
# Install Yarn
|
# Install Yarn
|
||||||
RUN npm install -g yarn@1.12.3
|
RUN npm install -g yarn@1.13.0
|
||||||
|
|
||||||
# Add files needed for installing dependencies
|
# Add files needed for installing dependencies
|
||||||
# Use directory /build for that purpose
|
# Use directory /build for that purpose
|
||||||
|
|
|
@ -211,9 +211,9 @@ function install_react_native_cli() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_yarn() {
|
function install_yarn() {
|
||||||
local expected_version="1.12.3"
|
local expected_version='1.13.0'
|
||||||
if ! program_exists "yarn"; then
|
if ! program_exists "yarn"; then
|
||||||
npm install -g yarn@$expected_version # Install the latest yarn
|
npm install -g yarn@$expected_version # Install the expected yarn version
|
||||||
else
|
else
|
||||||
cecho "+ yarn already installed... skipping."
|
cecho "+ yarn already installed... skipping."
|
||||||
fi
|
fi
|
||||||
|
@ -222,6 +222,7 @@ function install_yarn() {
|
||||||
local yarn_version=$(yarn -v)
|
local yarn_version=$(yarn -v)
|
||||||
if [[ $yarn_version != "$expected_version" ]]; then
|
if [[ $yarn_version != "$expected_version" ]]; then
|
||||||
cecho "@b@red[[+ yarn version $yarn_version is installed. yarn version $expected_version is recommended.]]"
|
cecho "@b@red[[+ yarn version $yarn_version is installed. yarn version $expected_version is recommended.]]"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ NC='\033[0m'
|
||||||
PLATFORM=""
|
PLATFORM=""
|
||||||
|
|
||||||
EXPECTED_NODE_VERSION="v10.14.0" # note the 'v' in front, that is how node does versioning
|
EXPECTED_NODE_VERSION="v10.14.0" # note the 'v' in front, that is how node does versioning
|
||||||
EXPECTED_YARN_VERSION="1.12.3" # note the lack of 'v' in front. inconsistent. :(
|
EXPECTED_YARN_VERSION="1.13.0" # note the lack of 'v' in front. inconsistent. :(
|
||||||
|
|
||||||
function program_exists() {
|
function program_exists() {
|
||||||
local program=$1
|
local program=$1
|
||||||
|
|
Loading…
Reference in New Issue