diff --git a/.github/labeler.yml b/.github/labeler.yml index f5c57259a8d..e175e24d419 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -54,7 +54,6 @@ docs: - tutorial - "*.rst" infra: - - "*travis*" - .github/* - .github/**/* - Dockerfile diff --git a/.github/travis/build.sh b/.github/scripts/build.sh similarity index 96% rename from .github/travis/build.sh rename to .github/scripts/build.sh index e8c3d99d5c6..924ba911ba1 100755 --- a/.github/travis/build.sh +++ b/.github/scripts/build.sh @@ -1,8 +1,9 @@ #!/bin/bash -source .github/travis/common.sh set -e +source $(dirname "$0")/common.sh + $SPACER start_section "vtr.build" "${GREEN}Building..${NC}" diff --git a/.github/travis/common.sh b/.github/scripts/common.sh similarity index 85% rename from .github/travis/common.sh rename to .github/scripts/common.sh index aa097ff96e8..6910b39e49b 100644 --- a/.github/travis/common.sh +++ b/.github/scripts/common.sh @@ -13,11 +13,6 @@ NC='\033[0m' # No Color SPACER="echo -e ${GRAY} - ${NC}" -travis_nanoseconds() { true; } -travis_fold() { true; } -travis_time_start() { true; } -travis_time_finish() { true; } - function start_section() { echo -e "${PURPLE}Verilog To Routing${NC}: - $2${NC}" echo -e "${GRAY}-------------------------------------------------------------------${NC}" diff --git a/.github/travis/cron_build.sh b/.github/scripts/cron_build.sh similarity index 98% rename from .github/travis/cron_build.sh rename to .github/scripts/cron_build.sh index 30211d79bc4..5a906c78213 100755 --- a/.github/travis/cron_build.sh +++ b/.github/scripts/cron_build.sh @@ -1,8 +1,9 @@ #!/bin/bash -source .github/travis/common.sh set -e +source $(dirname "$0")/common.sh + $SPACER if [ "_${_COVERITY_EMAIL}" == "_" ] || diff --git a/.github/gha/install_dependencies.sh b/.github/scripts/install_dependencies.sh similarity index 95% rename from .github/gha/install_dependencies.sh rename to .github/scripts/install_dependencies.sh index a2ee3898b7f..241d5dc3743 100755 --- a/.github/gha/install_dependencies.sh +++ b/.github/scripts/install_dependencies.sh @@ -49,3 +49,5 @@ sudo apt install -y \ clang-7 \ clang-10 # libtbb-dev + +pip install -r requirements.txt diff --git a/.github/travis/unittest.sh b/.github/scripts/unittest.sh similarity index 71% rename from .github/travis/unittest.sh rename to .github/scripts/unittest.sh index e3219e4b131..0aef473c515 100755 --- a/.github/travis/unittest.sh +++ b/.github/scripts/unittest.sh @@ -1,8 +1,11 @@ #!/bin/bash -source .github/travis/common.sh set -e +source $(dirname "$0")/common.sh + +$(dirname "$0")/build.sh + $SPACER start_section "vtr.test.0" "${GREEN}Testing..${NC} ${CYAN}C++ unit tests${NC}" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a1277f1500..fd907c7f791 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,19 +19,16 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: BUILD_TYPE: release - run: | - source .github/travis/common.sh - ./.github/travis/build.sh + run: ./.github/scripts/build.sh Format: @@ -46,17 +43,14 @@ jobs: name: 'F: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test - run: | - source .github/travis/common.sh - ./dev/${{ matrix.script }} + run: ./dev/${{ matrix.script }} UniTests: @@ -64,20 +58,16 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" - run: | - source .github/travis/common.sh - ./.github/travis/build.sh - ./.github/travis/unittest.sh + run: ./.github/scripts/unittest.sh Warnings: @@ -85,21 +75,18 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: #In order to get compilation warnings produced per source file, we must do a non-IPO build #We also turn warnings into errors for this target by doing a strict compile CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_STRICT_COMPILE=on -DVTR_IPO_BUILD=off" - run: | - source .github/travis/common.sh - ./.github/travis/build.sh + run: ./.github/scripts/build.sh Regression: @@ -137,19 +124,17 @@ jobs: name: 'R: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: CMAKE_PARAMS: ${{ matrix.params }} run: | - source .github/travis/common.sh - ./.github/travis/build.sh + ./.github/scripts/build.sh ./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 @@ -164,12 +149,11 @@ jobs: name: 'S: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: @@ -177,30 +161,28 @@ jobs: BUILD_TYPE: debug LSAN_OPTIONS: 'exitcode=42' #Use a non-standard exit code to ensure LSAN errors are detected run: | - source .github/travis/common.sh - ./.github/travis/build.sh + ./.github/scripts/build.sh # We skip QoR since we are only checking for errors in sanitizer runs ./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 -skip_qor + ODINII: name: 'ODIN-II Basic Tests' runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on' BUILD_TYPE: debug run: | - source .github/travis/common.sh - ./.github/travis/build.sh + ./.github/scripts/build.sh ./run_reg_test.py odin_reg_basic -show_failures -j2 @@ -221,21 +203,18 @@ jobs: name: 'B: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" MATRIX_EVAL: ${{ matrix.eval }} BUILD_TYPE: ${{ matrix.build }} - run: | - source .github/travis/common.sh - ./.github/travis/build.sh + run: ./.github/scripts/build.sh Coverity: @@ -252,18 +231,15 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install -r requirements.txt + - uses: actions/checkout@v2 + - run: ./.github/scripts/install_dependencies.sh - name: Test env: CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on' _COVERITY_URL: 'https://scan.coverity.com/download/linux64' _COVERITY_MD5: 'd0d7d7df9d6609e578f85096a755fb8f' - run: | - source .github/travis/common.sh - ./.github/travis/build.sh + run: ./.github/scripts/build.sh diff --git a/dev/check-format-py.sh b/dev/check-format-py.sh index acd40a943e1..48ab6df76b2 100755 --- a/dev/check-format-py.sh +++ b/dev/check-format-py.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +source $(dirname "$0")/../.github/scripts/common.sh + clean=$(git status -s -uno | wc -l) #Short ignore untracked if [ $clean -ne 0 ]; then diff --git a/dev/check-format.sh b/dev/check-format.sh index a77f33b8336..b236e6c60f0 100755 --- a/dev/check-format.sh +++ b/dev/check-format.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +source $(dirname "$0")/../.github/scripts/common.sh + clean=$(git status -s -uno | wc -l) #Short ignore untracked if [ $clean -ne 0 ]; then