From 36ac4387979c887df727ceda8f3a062e6f6d440b Mon Sep 17 00:00:00 2001 From: umarcor Date: Sun, 18 Jul 2021 17:19:19 +0200 Subject: [PATCH 1/3] ci: move scripts from '.github/gha' and '.github/travis' into '.github/scripts' --- .github/{travis => scripts}/build.sh | 2 +- .github/{travis => scripts}/common.sh | 0 .github/{travis => scripts}/cron_build.sh | 2 +- .../{gha => scripts}/install_dependencies.sh | 0 .github/{travis => scripts}/unittest.sh | 2 +- .github/workflows/test.yml | 54 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) rename .github/{travis => scripts}/build.sh (96%) rename .github/{travis => scripts}/common.sh (100%) rename .github/{travis => scripts}/cron_build.sh (98%) rename .github/{gha => scripts}/install_dependencies.sh (100%) rename .github/{travis => scripts}/unittest.sh (82%) 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..f2a1676d089 100755 --- a/.github/travis/build.sh +++ b/.github/scripts/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -source .github/travis/common.sh +source .github/scripts/common.sh set -e $SPACER diff --git a/.github/travis/common.sh b/.github/scripts/common.sh similarity index 100% rename from .github/travis/common.sh rename to .github/scripts/common.sh 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..e7824a815df 100755 --- a/.github/travis/cron_build.sh +++ b/.github/scripts/cron_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -source .github/travis/common.sh +source .github/scripts/common.sh set -e $SPACER diff --git a/.github/gha/install_dependencies.sh b/.github/scripts/install_dependencies.sh similarity index 100% rename from .github/gha/install_dependencies.sh rename to .github/scripts/install_dependencies.sh diff --git a/.github/travis/unittest.sh b/.github/scripts/unittest.sh similarity index 82% rename from .github/travis/unittest.sh rename to .github/scripts/unittest.sh index e3219e4b131..70cefdcc30f 100755 --- a/.github/travis/unittest.sh +++ b/.github/scripts/unittest.sh @@ -1,6 +1,6 @@ #!/bin/bash -source .github/travis/common.sh +source .github/scripts/common.sh set -e $SPACER diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a1277f1500..b35d3eea1f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -30,8 +30,8 @@ jobs: env: BUILD_TYPE: release run: | - source .github/travis/common.sh - ./.github/travis/build.sh + source .github/scripts/common.sh + ./.github/scripts/build.sh Format: @@ -47,7 +47,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -55,7 +55,7 @@ jobs: - name: Test run: | - source .github/travis/common.sh + source .github/scripts/common.sh ./dev/${{ matrix.script }} @@ -65,7 +65,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -75,9 +75,9 @@ jobs: env: CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" run: | - source .github/travis/common.sh - ./.github/travis/build.sh - ./.github/travis/unittest.sh + source .github/scripts/common.sh + ./.github/scripts/build.sh + ./.github/scripts/unittest.sh Warnings: @@ -86,7 +86,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -98,8 +98,8 @@ jobs: #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 + source .github/scripts/common.sh + ./.github/scripts/build.sh Regression: @@ -138,7 +138,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -148,8 +148,8 @@ jobs: env: CMAKE_PARAMS: ${{ matrix.params }} run: | - source .github/travis/common.sh - ./.github/travis/build.sh + source .github/scripts/common.sh + ./.github/scripts/build.sh ./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 @@ -165,7 +165,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -177,8 +177,8 @@ 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 + source .github/scripts/common.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 @@ -188,7 +188,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -199,8 +199,8 @@ jobs: 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 + source .github/scripts/common.sh + ./.github/scripts/build.sh ./run_reg_test.py odin_reg_basic -show_failures -j2 @@ -222,7 +222,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -234,8 +234,8 @@ jobs: MATRIX_EVAL: ${{ matrix.eval }} BUILD_TYPE: ${{ matrix.build }} run: | - source .github/travis/common.sh - ./.github/travis/build.sh + source .github/scripts/common.sh + ./.github/scripts/build.sh Coverity: @@ -253,7 +253,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./.github/gha/install_dependencies.sh + - run: ./.github/scripts/install_dependencies.sh - uses: actions/setup-python@v2 with: python-version: 3.6 @@ -265,5 +265,5 @@ jobs: _COVERITY_URL: 'https://scan.coverity.com/download/linux64' _COVERITY_MD5: 'd0d7d7df9d6609e578f85096a755fb8f' run: | - source .github/travis/common.sh - ./.github/travis/build.sh + source .github/scripts/common.sh + ./.github/scripts/build.sh From dc1ca82758d0b1496a3cbf87f4b78d6ca08ddc12 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sun, 18 Jul 2021 17:19:19 +0200 Subject: [PATCH 2/3] ci: cleanup --- .github/labeler.yml | 1 - .github/scripts/build.sh | 3 ++- .github/scripts/common.sh | 5 ----- .github/scripts/cron_build.sh | 3 ++- .github/scripts/unittest.sh | 5 ++++- .github/workflows/test.yml | 28 ++++++---------------------- dev/check-format-py.sh | 2 ++ dev/check-format.sh | 2 ++ 8 files changed, 18 insertions(+), 31 deletions(-) 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/scripts/build.sh b/.github/scripts/build.sh index f2a1676d089..924ba911ba1 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -1,8 +1,9 @@ #!/bin/bash -source .github/scripts/common.sh set -e +source $(dirname "$0")/common.sh + $SPACER start_section "vtr.build" "${GREEN}Building..${NC}" diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh index aa097ff96e8..6910b39e49b 100644 --- a/.github/scripts/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/scripts/cron_build.sh b/.github/scripts/cron_build.sh index e7824a815df..5a906c78213 100755 --- a/.github/scripts/cron_build.sh +++ b/.github/scripts/cron_build.sh @@ -1,8 +1,9 @@ #!/bin/bash -source .github/scripts/common.sh set -e +source $(dirname "$0")/common.sh + $SPACER if [ "_${_COVERITY_EMAIL}" == "_" ] || diff --git a/.github/scripts/unittest.sh b/.github/scripts/unittest.sh index 70cefdcc30f..0aef473c515 100755 --- a/.github/scripts/unittest.sh +++ b/.github/scripts/unittest.sh @@ -1,8 +1,11 @@ #!/bin/bash -source .github/scripts/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 b35d3eea1f6..f9c64bd2eb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,9 +29,7 @@ jobs: - name: Test env: BUILD_TYPE: release - run: | - source .github/scripts/common.sh - ./.github/scripts/build.sh + run: ./.github/scripts/build.sh Format: @@ -54,9 +52,7 @@ jobs: - run: pip install -r requirements.txt - name: Test - run: | - source .github/scripts/common.sh - ./dev/${{ matrix.script }} + run: ./dev/${{ matrix.script }} UniTests: @@ -74,10 +70,7 @@ jobs: - name: Test env: CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" - run: | - source .github/scripts/common.sh - ./.github/scripts/build.sh - ./.github/scripts/unittest.sh + run: ./.github/scripts/unittest.sh Warnings: @@ -97,9 +90,7 @@ jobs: #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/scripts/common.sh - ./.github/scripts/build.sh + run: ./.github/scripts/build.sh Regression: @@ -148,7 +139,6 @@ jobs: env: CMAKE_PARAMS: ${{ matrix.params }} run: | - source .github/scripts/common.sh ./.github/scripts/build.sh ./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 @@ -177,7 +167,6 @@ jobs: BUILD_TYPE: debug LSAN_OPTIONS: 'exitcode=42' #Use a non-standard exit code to ensure LSAN errors are detected run: | - source .github/scripts/common.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 @@ -199,7 +188,6 @@ jobs: CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on' BUILD_TYPE: debug run: | - source .github/scripts/common.sh ./.github/scripts/build.sh ./run_reg_test.py odin_reg_basic -show_failures -j2 @@ -233,9 +221,7 @@ jobs: CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on" MATRIX_EVAL: ${{ matrix.eval }} BUILD_TYPE: ${{ matrix.build }} - run: | - source .github/scripts/common.sh - ./.github/scripts/build.sh + run: ./.github/scripts/build.sh Coverity: @@ -264,6 +250,4 @@ jobs: CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on' _COVERITY_URL: 'https://scan.coverity.com/download/linux64' _COVERITY_MD5: 'd0d7d7df9d6609e578f85096a755fb8f' - run: | - source .github/scripts/common.sh - ./.github/scripts/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 From 54402b0ef2bebbf43929cc13ec05066d2dff530a Mon Sep 17 00:00:00 2001 From: umarcor Date: Sun, 18 Jul 2021 17:34:49 +0200 Subject: [PATCH 3/3] ci: install pip dependencies in 'install_dependencies.sh', cleanup accordingly --- .github/scripts/install_dependencies.sh | 2 ++ .github/workflows/test.yml | 46 ++++++++++--------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.github/scripts/install_dependencies.sh b/.github/scripts/install_dependencies.sh index a2ee3898b7f..241d5dc3743 100755 --- a/.github/scripts/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/workflows/test.yml b/.github/workflows/test.yml index f9c64bd2eb4..fd907c7f791 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,12 +19,11 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -44,12 +43,11 @@ jobs: name: 'F: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: ./dev/${{ matrix.script }} @@ -60,12 +58,11 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -78,12 +75,11 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -128,12 +124,11 @@ jobs: name: 'R: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -154,12 +149,11 @@ jobs: name: 'S: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -171,17 +165,17 @@ jobs: # 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/scripts/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: @@ -209,12 +203,11 @@ jobs: name: 'B: ${{ matrix.name }}' steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: @@ -238,12 +231,11 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - run: ./.github/scripts/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: