Skip to content

Commit 2f36a69

Browse files
grisumbrasgrisumbras
committed
Use drone scripts in GHA
1 parent 307d190 commit 2f36a69

File tree

2 files changed

+16
-224
lines changed

2 files changed

+16
-224
lines changed

‎.drone/drone.bat‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
@ECHO ON
33
setlocal enabledelayedexpansion
44

5+
IF "!GHA_TARGET_BRANCH!" == "" (
6+
for /F %%i in ("!GITHUB_REF!") do @set GHA_TARGET_BRANCH=%%~nxi
7+
for /F %%i in ("!GITHUB_REF!") do @set TRAVIS_BRANCH=%%~nxi
8+
)
9+
510
if "%DRONE_JOB_BUILDTYPE%" == "boost" (
611

12+
echo "Running boost job"
713
echo '==================================> INSTALL'
814

915
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 224 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ jobs:
389389
LLVM_VER: ${{ matrix.llvm_ver }}
390390
PACKAGES: ${{ matrix.packages }}
391391
PACKAGES_TO_REMOVE: ${{ matrix.packages_to_remove }}
392-
JOB_BUILDTYPE: ${{ matrix.buildtype }}
393392
COMMENT: ${{ matrix.comment }}
394393
LCOV_BRANCH_COVERAGE: ${{ matrix.lcov_branch_coverage }}
395394
B2_CXXSTD: ${{ matrix.b2_cxxstd }}
@@ -401,6 +400,9 @@ jobs:
401400
B2_ASAN: ${{ matrix.b2_asan }}
402401
B2_UBSAN: ${{ matrix.b2_ubsan }}
403402
TRAVIS_BRANCH: ${{ github.base_ref }}
403+
DRONE_BUILD_EVENT: ${{ github.event_name }}
404+
DRONE_COMMIT: ${{ github.sha }}
405+
DRONE_JOB_BUILDTYPE: ${{ matrix.buildtype }}
404406
TRAVIS_OS_NAME: "linux"
405407
run: |
406408
echo '==================================> SETUP'
@@ -431,171 +433,9 @@ jobs:
431433
sudo -E DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=3 -y --no-install-suggests --no-install-recommends install ${PACKAGES}
432434
433435
echo '==================================> INSTALL AND COMPILE'
434-
set -e
435-
export TRAVIS_BUILD_DIR=$(pwd)
436-
export TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')}
437-
export VCS_COMMIT_ID=$GITHUB_SHA
438-
export GIT_COMMIT=$GITHUB_SHA
439-
export REPO_NAME=$(basename $GITHUB_REPOSITORY)
440-
export USER=$(whoami)
441-
export CC=${CC:-gcc}
442-
export PATH=~/.local/bin:/usr/local/bin:$PATH
443-
444-
if [ "$JOB_BUILDTYPE" == "docs" ]; then
445-
446-
echo '==================================> INSTALL'
447-
448-
export SELF=`basename $REPO_NAME`
449-
450-
pwd
451-
cd ..
452-
mkdir -p $HOME/cache && cd $HOME/cache
453-
if [ ! -d doxygen ]; then git clone -b 'Release_1_8_15' --depth 1 https://github.com/doxygen/doxygen.git && echo "not-cached" ; else echo "cached" ; fi
454-
cd doxygen
455-
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
456-
cd build
457-
sudo make install
458-
cd ../..
459-
if [ ! -f saxonhe.zip ]; then wget -O saxonhe.zip https://sourceforge.net/projects/saxon/files/Saxon-HE/9.9/SaxonHE9-9-1-4J.zip/download && echo "not-cached" ; else echo "cached" ; fi
460-
unzip -o saxonhe.zip
461-
sudo rm /usr/share/java/Saxon-HE.jar
462-
sudo cp saxon9he.jar /usr/share/java/Saxon-HE.jar
463-
cd ..
464-
BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
465-
git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root --depth 1
466-
cd boost-root
467-
export BOOST_ROOT=$(pwd)
468-
git submodule update --init libs/context
469-
git submodule update --init tools/boostbook
470-
git submodule update --init tools/boostdep
471-
git submodule update --init tools/docca
472-
git submodule update --init tools/quickbook
473-
rsync -av $TRAVIS_BUILD_DIR/ libs/$SELF
474-
python tools/boostdep/depinst/depinst.py ../tools/quickbook
475-
./bootstrap.sh
476-
./b2 headers
477-
478-
echo '==================================> SCRIPT'
479-
480-
echo "using doxygen ; using boostbook ; using saxonhe ;" > tools/build/src/user-config.jam
481-
./b2 -j3 libs/$SELF/doc//boostrelease
482-
483-
elif [ "$JOB_BUILDTYPE" == "codecov" ]; then
484-
485-
echo '==================================> INSTALL'
486-
487-
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
488-
cp -prf boost-ci-cloned/ci .
489-
rm -rf boost-ci-cloned
490-
491-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
492-
unset -f cd
493-
fi
494-
495-
export SELF=`basename $REPO_NAME`
496-
export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
497-
export BOOST_CI_SRC_FOLDER=$(pwd)
498-
499-
. ./ci/common_install.sh
500-
501-
echo '==================================> SCRIPT'
502-
503-
cd $BOOST_ROOT/libs/$SELF
504-
ci/travis/codecov.sh
505-
506-
elif [ "$JOB_BUILDTYPE" == "valgrind" ]; then
507-
508-
echo '==================================> INSTALL'
509-
510-
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
511-
cp -prf boost-ci-cloned/ci .
512-
rm -rf boost-ci-cloned
513-
514-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
515-
unset -f cd
516-
fi
517-
518-
export SELF=`basename $REPO_NAME`
519-
export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
520-
export BOOST_CI_SRC_FOLDER=$(pwd)
521-
522-
. ./ci/common_install.sh
523-
524-
echo '==================================> SCRIPT'
525-
526-
cd $BOOST_ROOT/libs/$SELF
527-
ci/travis/valgrind.sh
528-
529-
elif [ "$JOB_BUILDTYPE" == "boost" ]; then
530-
531-
echo '==================================> INSTALL'
532-
533-
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
534-
cp -prf boost-ci-cloned/ci .
535-
rm -rf boost-ci-cloned
536-
537-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
538-
unset -f cd
539-
fi
540-
541-
export SELF=`basename $REPO_NAME`
542-
export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
543-
export BOOST_CI_SRC_FOLDER=$(pwd)
544-
545-
. ./ci/common_install.sh
546-
547-
echo '==================================> SCRIPT'
548-
549-
export B2_TARGETS="libs/$SELF/test libs/$SELF/example"
550-
$BOOST_ROOT/libs/$SELF/ci/travis/build.sh
551-
552-
elif [ "$JOB_BUILDTYPE" == "standalone" ]; then
553-
554-
echo '==================================> INSTALL'
555-
556-
pip install --user cmake
557-
558-
echo '==================================> SCRIPT'
559-
560-
export CXXFLAGS="-Wall -Wextra -std=c++17"
561-
mkdir __build_17
562-
cd __build_17
563-
cmake -DBOOST_JSON_STANDALONE=1 ..
564-
cmake --build .
565-
ctest -V .
566-
export CXXFLAGS="-Wall -Wextra -std=c++2a"
567-
mkdir ../__build_2a
568-
cd ../__build_2a
569-
cmake -DBOOST_JSON_STANDALONE=1 ..
570-
cmake --build .
571-
ctest -V .
572-
573-
elif [ "$JOB_BUILDTYPE" == "coverity" ]; then
574-
575-
echo '==================================> INSTALL'
576-
577-
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
578-
cp -prf boost-ci-cloned/ci .
579-
rm -rf boost-ci-cloned
580-
581-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
582-
unset -f cd
583-
fi
584-
585-
export SELF=`basename $REPO_NAME`
586-
export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
587-
export BOOST_CI_SRC_FOLDER=$(pwd)
588-
589-
. ./ci/common_install.sh
590-
591-
echo '==================================> SCRIPT'
592-
593-
if [ -n "${COVERITY_SCAN_NOTIFICATION_EMAIL}" -a \( "$TRAVIS_BRANCH" = "develop" -o "$TRAVIS_BRANCH" = "master" \) -a \("$GITHUB_EVENT_NAME" = "push" -o "$GITHUB_EVENT_NAME" = "cron" \) ] ; then
594-
cd $BOOST_ROOT/libs/$SELF
595-
ci/travis/coverity.sh
596-
fi
597-
598-
fi
436+
export DRONE_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')}
437+
export DRONE_REPO=$(basename $GITHUB_REPOSITORY)
438+
. .drone/drone.sh
599439
windows:
600440
strategy:
601441
fail-fast: false
@@ -653,7 +493,6 @@ jobs:
653493
LLVM_OS: ${{ matrix.llvm_os }}
654494
LLVM_VER: ${{ matrix.llvm_ver }}
655495
PACKAGES: ${{ matrix.packages }}
656-
JOB_BUILDTYPE: ${{ matrix.buildtype }}
657496
COMMENT: ${{ matrix.comment }}
658497
LCOV_BRANCH_COVERAGE: ${{ matrix.lcov_branch_coverage }}
659498
B2_CXXSTD: ${{ matrix.b2_cxxstd }}
@@ -666,62 +505,9 @@ jobs:
666505
B2_UBSAN: ${{ matrix.b2_ubsan }}
667506
GHA_TARGET_BRANCH: ${{ github.base_ref }}
668507
TRAVIS_BRANCH: ${{ github.base_ref }}
508+
DRONE_JOB_BUILDTYPE: ${{ matrix.buildtype }}
509+
DRONE_COMMIT_BRANCH: ${{ github.base_ref }}
510+
DRONE_REPO: ${{ github.repository }}
669511
TRAVIS_OS_NAME: "windows"
670512
run: |
671-
672-
@ECHO ON
673-
setlocal enabledelayedexpansion
674-
675-
IF "!GHA_TARGET_BRANCH!" == "" (
676-
for /F %%i in ("!GITHUB_REF!") do @set GHA_TARGET_BRANCH=%%~nxi
677-
for /F %%i in ("!GITHUB_REF!") do @set TRAVIS_BRANCH=%%~nxi
678-
)
679-
680-
if "!JOB_BUILDTYPE!" == "boost" (
681-
682-
echo "Running boost job"
683-
echo '==================================> INSTALL'
684-
685-
git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
686-
cp -prf boost-ci-cloned/ci .
687-
rm -rf boost-ci-cloned
688-
REM source ci/travis/install.sh
689-
REM The contents of install.sh below:
690-
691-
for /F %%i in ("!GITHUB_REPOSITORY!") do @set SELF=%%~nxi
692-
SET BOOST_CI_TARGET_BRANCH=!GHA_TARGET_BRANCH!
693-
SET BOOST_CI_SRC_FOLDER=!cd!
694-
695-
call ci\common_install.bat
696-
697-
echo '==================================> COMPILE'
698-
699-
set B2_TARGETS=libs/!SELF!/test libs/!SELF!/example
700-
call !BOOST_ROOT!\libs\!SELF!\ci\build.bat
701-
702-
) else if "!JOB_BUILDTYPE!" == "standalone-windows" (
703-
704-
echo "Running standalone-windows"
705-
echo '==================================> BEFORE_INSTALL'
706-
707-
echo '==================================> INSTALL'
708-
709-
REM Installing cmake with choco in the Dockerfile, so not required here:
710-
REM choco install cmake
711-
712-
echo '==================================> COMPILE'
713-
714-
set CXXFLAGS="/std:c++17"
715-
mkdir __build_17
716-
cd __build_17
717-
cmake -DBOOST_JSON_STANDALONE=1 ..
718-
cmake --build .
719-
ctest -V -C Debug .
720-
set CXXFLAGS="/std:c++latest"
721-
mkdir ..\__build_2a
722-
cd ..\__build_2a
723-
cmake -DBOOST_JSON_STANDALONE=1 ..
724-
cmake --build .
725-
ctest -V -C Debug .
726-
)
727-
513+
call .drone\drone.bat

0 commit comments

Comments
 (0)