Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Python 36 for centos7 and amazonlinux1 #7005

Merged
merged 2 commits into from
Mar 28, 2019
Merged

Python 36 for centos7 and amazonlinux1 #7005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c15511
python36 for centos and amazonlinux1
Mar 28, 2019
28cdc4f
the infamous m folder name
Mar 28, 2019
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
44 changes: 22 additions & 22 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -38,7 +38,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -59,7 +59,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -80,7 +80,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -101,7 +101,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -122,7 +122,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
workdir: /data/job
timeout: 60

Expand Down Expand Up @@ -173,7 +173,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -193,7 +193,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -214,7 +214,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -234,7 +234,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -255,7 +255,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -275,7 +275,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -296,7 +296,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -316,7 +316,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -337,7 +337,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -357,7 +357,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -378,7 +378,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
workdir: /data/job
timeout: 60

Expand All @@ -398,7 +398,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
workdir: /data/job
timeout: 60

Expand Down Expand Up @@ -501,7 +501,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
workdir: /data/job
env:
OS: "ubuntu-16.04"
Expand All @@ -527,7 +527,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
workdir: /data/job
env:
OS: "ubuntu-18.04"
Expand Down Expand Up @@ -560,7 +560,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
workdir: /data/job
env:
OS: "fc27"
Expand Down Expand Up @@ -593,7 +593,7 @@ steps:
region: "us-west-2"
docker#v2.1.0:
debug: true
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
workdir: /data/job
env:
OS: "el7"
Expand Down
6 changes: 3 additions & 3 deletions scripts/eosio_build_amazon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ DISK_AVAIL_KB=$( df . | tail -1 | awk '{print $4}' )
DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))

if [[ "${OS_NAME}" == "Amazon Linux AMI" ]]; then
if [[ "${OS_NAME}" == "Amazon Linux AMI" ]]; then # Amazonlinux1
DEP_ARRAY=(
sudo procps util-linux which gcc72 gcc72-c++ autoconf automake libtool make doxygen graphviz \
bzip2 bzip2-devel openssl-devel gmp gmp-devel libstdc++72 python27 python27-devel python34 python34-devel \
bzip2 bzip2-devel openssl-devel gmp gmp-devel libstdc++72 python27 python27-devel python36 python36-devel \
libedit-devel ncurses-devel swig wget file libcurl-devel libusb1-devel
)
else
else # Amazonlinux2
DEP_ARRAY=(
git procps-ng util-linux gcc gcc-c++ autoconf automake libtool make bzip2 \
bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel libusbx-devel \
Expand Down
12 changes: 6 additions & 6 deletions scripts/eosio_build_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ printf "\\n"
DEP_ARRAY=(
git autoconf automake libtool make bzip2 doxygen graphviz \
bzip2-devel openssl-devel gmp-devel \
ocaml libicu-devel python python-devel python33 \
ocaml libicu-devel python python-devel rh-python36 \
gettext-devel file sudo libusbx-devel libcurl-devel
)
COUNT=1
Expand Down Expand Up @@ -160,10 +160,10 @@ else
printf " - No required YUM dependencies to install.\\n\\n"
fi

if [ -d /opt/rh/python33 ]; then
printf "Enabling python33...\\n"
source /opt/rh/python33/enable || exit 1
printf " - Python33 successfully enabled!\\n"
if [ -d /opt/rh/rh-python36 ]; then
printf "Enabling python36...\\n"
source /opt/rh/rh-python36/enable || exit 1
printf " - Python36 successfully enabled!\\n"
fi

printf "\\n"
Expand All @@ -190,7 +190,7 @@ if [ $? -ne 0 ]; then exit -1; fi
printf "\\n"


export CPATH="$CPATH:/opt/rh/python33/root/usr/include/python3.3m" # m on the end causes problems with boost finding python3
export CPATH="$CPATH:/opt/rh/rh-python36/root/usr/include/python3.6m" # m on the end causes problems with boost finding python3
printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
BOOSTVERSION=$( grep "#define BOOST_VERSION" "$HOME/opt/boost/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\ -f3 )
if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ]; then
Expand Down