From fd973acd34175d3bc9349db6f3101b927e33f390 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 30 Oct 2020 15:14:39 -0400 Subject: [PATCH] build-test: Remove references to "travis" in build tests Use "ci-build.sh" "ci-install.sh" and similar, as travis-ci is no longer being used. Signed-off-by: Kevin O'Connor --- .github/workflows/build-test.yaml | 10 +++++----- scripts/{travis-build.sh => ci-build.sh} | 8 ++++---- scripts/{travis-install.sh => ci-install.sh} | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) rename scripts/{travis-build.sh => ci-build.sh} (91%) rename scripts/{travis-install.sh => ci-install.sh} (88%) diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index be4d74c4..bcd98fd3 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -14,17 +14,17 @@ jobs: - name: Setup cache uses: actions/cache@v2 with: - path: travis_cache - key: ${{ runner.os }}-build-${{ hashFiles('scripts/travis-install.sh') }} + path: ci_cache + key: ${{ runner.os }}-build-${{ hashFiles('scripts/ci-install.sh') }} - name: Prepare tests - run: ./scripts/travis-install.sh + run: ./scripts/ci-install.sh - name: Test - run: ./scripts/travis-build.sh 2>&1 + run: ./scripts/ci-build.sh 2>&1 - name: Upload micro-controller data dictionaries uses: actions/upload-artifact@v2 with: name: data-dict - path: travis_build/dict + path: ci_build/dict diff --git a/scripts/travis-build.sh b/scripts/ci-build.sh similarity index 91% rename from scripts/travis-build.sh rename to scripts/ci-build.sh index 913a2aa0..e5f97754 100755 --- a/scripts/travis-build.sh +++ b/scripts/ci-build.sh @@ -1,18 +1,18 @@ #!/bin/bash -# Test script for travis-ci.org continuous integration. +# Test script for continuous integration. # Stop script early on any error; check variables set -eu -# Paths to tools installed by travis-install.sh +# Paths to tools installed by ci-install.sh MAIN_DIR=${PWD} -BUILD_DIR=${PWD}/travis_build +BUILD_DIR=${PWD}/ci_build export PATH=${BUILD_DIR}/pru-gcc/bin:${PATH} PYTHON=${BUILD_DIR}/python-env/bin/python ###################################################################### -# Travis CI helpers +# Section grouping output message helpers ###################################################################### start_test() diff --git a/scripts/travis-install.sh b/scripts/ci-install.sh similarity index 88% rename from scripts/travis-install.sh rename to scripts/ci-install.sh index 0bb1ff6d..7a536c81 100755 --- a/scripts/travis-install.sh +++ b/scripts/ci-install.sh @@ -1,13 +1,13 @@ #!/bin/bash -# Build setup script for travis-ci.org continuous integration testing. -# See travis-build.sh for the actual test steps. +# Build setup script for continuous integration testing. +# See ci-build.sh for the actual test steps. # Stop script early on any error; check variables; be verbose set -eux MAIN_DIR=${PWD} -BUILD_DIR=${PWD}/travis_build -CACHE_DIR=${PWD}/travis_cache +BUILD_DIR=${PWD}/ci_build +CACHE_DIR=${PWD}/ci_cache mkdir -p ${BUILD_DIR} ${CACHE_DIR}