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.

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

build: Remove travis references #2156

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on: [push, pull_request]
env:
EVENT_TYPE: ${{ github.event_name }}
COMMIT_COUNT: ${{ github.event.commits.length }}
CI_REPO_SLUG: ${{ github.repository }}
jobs:
test-linux:
name: ${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ Build Status

| Development | Staging | Master |
|----------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
| [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=development)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=staging)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=master)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) |
| ![Build Status](https://github.com/gridcoin-community/Gridcoin-Research/actions/workflows/ci.yml/badge.svg?branch=development) | ![Build Status](https://github.com/gridcoin-community/Gridcoin-Research/actions/workflows/ci.yml/badge.svg?branch=staging) | ![Build Status](https://github.com/gridcoin-community/Gridcoin-Research/actions/workflows/ci.yml/badge.svg?branch=staging) |
8 changes: 4 additions & 4 deletions ci/lint/06_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

export LC_ALL=C

if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE
if [ "$GITHUB_EVENT_TYPE" = "pull_request" ]; then
test/lint/commit-script-check.sh $CI_COMMIT_RANGE
fi
barton2526 marked this conversation as resolved.
Show resolved Hide resolved

if [ "$EVENT_TYPE" = "pull_request" ]; then
Expand All @@ -22,8 +22,8 @@ fi
#test/lint/check-rpc-mappings.py .
test/lint/lint-all.sh

#if [ "$TRAVIS_REPO_SLUG" = "gridcoin-community/Gridcoin-Research" ] && [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
#if [ "$CI_REPO_SLUG" = "gridcoin-community/Gridcoin-Research" ] && [ "$CI_EVENT_TYPE" = "cron" ]; then
barton2526 marked this conversation as resolved.
Show resolved Hide resolved
# git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
# travis_retry gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $(<contrib/verify-commits/trusted-keys) &&
# $CI_RETRY_EXE gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $(<contrib/verify-commits/trusted-keys) &&
# ./contrib/verify-commits/verify-commits.py --clean-merge=2;
#fi
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ export GOAL="install"
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
# This could be removed once the ABI change warning does not show up by default
export GRIDCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi --enable-werror"
# Disable QT as it takes too long to compile on Travis
# Disable QT as it takes too long to compile on CI
export DEP_OPTS="NO_QT=1"
10 changes: 1 addition & 9 deletions ci/test/03_before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,12 @@ export LC_ALL=C.UTF-8
BEGIN_FOLD () {
echo ""
CURRENT_FOLD_NAME=$1
if [ "$TRAVIS" == "true" ]; then
echo "travis_fold:start:${CURRENT_FOLD_NAME}"
else
echo "::group::${CURRENT_FOLD_NAME}"
fi
echo "::group::${CURRENT_FOLD_NAME}"
}

END_FOLD () {
RET=$?
if [ "$TRAVIS" == "true" ]; then
echo "travis_fold:end:${CURRENT_FOLD_NAME}"
else
echo "::endgroup::"
fi
if [ $RET != 0 ]; then
echo "${CURRENT_FOLD_NAME} failed with status code ${RET}"
fi
Expand Down
6 changes: 3 additions & 3 deletions test/lint/lint-shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

export LC_ALL=C

# The shellcheck binary segfault/coredumps in Travis with LC_ALL=C
# The shellcheck binary segfault/coredumps in CI with LC_ALL=C
# It does not do so in Ubuntu 14.04, 16.04, 18.04 in versions 0.3.3, 0.3.7, 0.4.6
# respectively. So export LC_ALL=C is set as required by lint-shell-locale.sh
# but unset here in case of running in Travis.
if [ "$TRAVIS" = "true" ]; then
# but unset here in case of running in CI.
if [ "$CI" = "true" ]; then
unset LC_ALL
fi

Expand Down
14 changes: 7 additions & 7 deletions test/lint/lint-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,32 @@ while getopts "?" opt; do
case $opt in
?)
echo "Usage: $0 [N]"
echo " TRAVIS_COMMIT_RANGE='<commit range>' $0"
echo " CI_COMMIT_RANGE='<commit range>' $0"
echo " $0 -?"
echo "Checks unstaged changes, the previous N commits, or a commit range."
echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' $0"
echo "CI_COMMIT_RANGE='47ba2c3...ee50c9e' $0"
exit 0
;;
esac
done

if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then
if [ -z "${CI_COMMIT_RANGE}" ]; then
if [ -n "$1" ]; then
TRAVIS_COMMIT_RANGE="HEAD~$1...HEAD"
CI_COMMIT_RANGE="HEAD~$1...HEAD"
else
TRAVIS_COMMIT_RANGE="HEAD"
CI_COMMIT_RANGE="HEAD"
fi
fi

showdiff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
if ! git diff -U0 "${CI_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
echo "Failed to get a diff"
exit 1
fi
}

showcodediff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
if ! git diff -U0 "${CI_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
echo "Failed to get a diff"
exit 1
fi
Expand Down