Skip to content
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

Jump to bottom

Fix winnie build #2514

Merged
merged 3 commits into from
May 12, 2023
Merged

Fix winnie build #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd475d
Fix winnie build and test. References #2513
robe2 May 12, 2023
682509f
Exclude checking winnie's build script from shell checking
robe2 May 12, 2023
226264e
Didn't exclude right test
robe2 May 12, 2023
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
50 changes: 25 additions & 25 deletions ci/winnie/build_pgrouting.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ then
echo "PATH ${PATH}"
fi

BOOST_VER=1.59.0
BOOST_VER_WU=1_59_0
BOOST_VER_WUM=1_59
ZLIB_VER=1.2.8
BOOST_VER=1.78.0
BOOST_VER_WU=1_78_0
BOOST_VER_WUM=1_78
ZLIB_VER=1.2.13
echo "${BOOST_VER}"

if [ $JENKINS_DEBUG -eq 1 ]
Expand Down Expand Up @@ -123,40 +123,40 @@ echo "***************************"
echo "Current contents of PGPATH ${PGPATH}"
echo "***************************"
#---------------
ls "${PGPATH}/lib/libpgrouting*"
ls "${PGPATH}/share/extension/pgrouting*"
ls ${PGPATH}/lib/libpgrouting*
ls ${PGPATH}/share/extension/pgrouting*

#---------------
echo
echo "***************************"
echo "Current contents of PGPATHEDB ${PGPATHEDB}"
echo "***************************"
#---------------
ls "${PGPATHEDB}/lib/libpgrouting*"
ls "${PGPATHEDB}/share/extension/pgrouting*"
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*

rm "${PGPATH}/lib/libpgrouting*"
rm "${PGPATH}/share/extension/pgrouting*"
rm "${PGPATHEDB}/lib/libpgrouting*"
rm "${PGPATHEDB}/share/extension/pgrouting*"
rm ${PGPATH}/lib/libpgrouting*
rm ${PGPATH}/share/extension/pgrouting*
rm ${PGPATHEDB}/lib/libpgrouting
rm ${PGPATHEDB}/share/extension/pgrouting*

#---------------
echo
echo "***************************"
echo "After removing in PGPATH ${PGPATH}"
echo "***************************"
#---------------
ls "${PGPATH}"/lib/libpgrouting*
ls "${PGPATH}"/share/extension/pgrouting*
ls ${PGPATH}/lib/libpgrouting*
ls ${PGPATH}/share/extension/pgrouting*

#---------------
echo
echo "***************************"
echo "After removing in PGPATHEDB ${PGPATHEDB}"
echo "***************************"
#---------------
ls "${PGPATHEDB}"/lib/libpgrouting*
ls "${PGPATHEDB}"/share/extension/pgrouting*
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*
cmake --version

cmake -G "MSYS Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \
Expand Down Expand Up @@ -188,8 +188,8 @@ echo "***************************"
echo "Current contents of PGPATH ${PGPATH}"
echo "***************************"
#---------------
ls "${PGPATH}/lib/libpgrouting*"
ls "${PGPATH}/share/extension/pgrouting*"
ls ${PGPATH}/lib/libpgrouting*
ls ${PGPATH}/share/extension/pgrouting*

#---------------
echo
Expand All @@ -198,24 +198,24 @@ echo "Current contents of PGPATHEDB ${PGPATHEDB}"
echo Should be empty
echo "***************************"
#---------------
ls "${PGPATHEDB}"/lib/libpgrouting*
ls "${PGPATHEDB}"/share/extension/pgrouting*
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*


#we need uninstall and reinstall copy to VC++ EDB instance if we want to test on standard Windows installed versions
#cp *.dll ${PGPATHEDB}/lib/ #TODO remove this once we fix so the .dlls are created in lib folder
cp -r "${PGPATH}/lib/libpgrouting*.dll" "${PGPATHEDB}/lib/"
cp -r "${PGPATH}/share/extension/pgrouting*.sql" "${PGPATHEDB}/share/extension/"
cp -r "${PGPATH}/share/extension/pgrouting.control" "${PGPATHEDB}/share/extension/"
cp -r ${PGPATH}/lib/libpgrouting*.dll ${PGPATHEDB}/lib/
cp -r ${PGPATH}/share/extension/pgrouting*.sql ${PGPATHEDB}/share/extension/
cp -r ${PGPATH}/share/extension/pgrouting.control ${PGPATHEDB}/share/extension/

#---------------
echo
echo "***************************"
echo "After copying to PGPATHEDB ${PGPATHEDB}"
echo "***************************"
#---------------
ls "${PGPATHEDB}/lib/libpgrouting*"
ls "${PGPATHEDB}/share/extension/pgrouting*"
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*

cd "${PROJECTS}/pgrouting/branches/${PGROUTING_VER}" || exit 1

Expand Down
12 changes: 6 additions & 6 deletions ci/winnie/package_pgrouting.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ export PATH="${PATHOLD}:${PostgreSQL_ROOT}/bin:${PostgreSQL_ROOT}/lib"
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
GMP_VER=5.1.2
MPFR_VER=3.1.2
CGAL_VER=4.6.1
BOOST_VER=1.59.0
BOOST_VER_WU=1_59_0
BOOST_VER_WUM=1_59
CGAL_VER=5.0.3
BOOST_VER=1.78.0
BOOST_VER_WU=1_78_0
BOOST_VER_WUM=1_78
echo "$BOOST_VER_WU"
echo "$BOOST_VER_WUM"
else
GMP_VER=5.1.2
MPFR_VER=3.1.2
CGAL_VER=3.9
BOOST_VER=1.46.1
CGAL_VER=5.0.3
BOOST_VER=1.78.0
echo "$GMP_VER"
echo "$MPFR_VER"
fi;
Expand Down
2 changes: 2 additions & 0 deletions tools/scripts/test_shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ for f in $(git ls-files | grep '\.sh')
do
if [ "${f}" = "tools/developer/addNewVersionLink.sh" ] ; then
result=$(shellcheck --exclude=SC2046,SC2016 "${f}")
elif [ "${f}" = "ci/winnie/build_pgrouting.sh" ] ; then
result=$(shellcheck --exclude=SC2046,SC2016,SC2141,SC2086 "${f}")
else
result=$(shellcheck --exclude=SC2141 "${f}")
fi
Expand Down