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.

Sign up for GitHub

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 7 commits into from
Jun 5, 2021
Merged

build: Remove travis references #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5402d6b
Remove more references to Travis
barton2526 Jun 2, 2021
5b2149c
Fix badges
barton2526 Jun 2, 2021
7446c6d
Update ci/lint/06_script.sh
barton2526 Jun 3, 2021
f9eec72
Update ci/lint/06_script.sh
barton2526 Jun 3, 2021
e1542b7
Add suggestion
barton2526 Jun 3, 2021
4ec5399
Update ci/lint/06_script.sh
barton2526 Jun 3, 2021
2b2b629
Merge branch 'development' into remove_travis
barton2526 Jun 4, 2021
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
View file
Open in desktop
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
View file
Open in desktop
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) |
7 changes: 2 additions & 5 deletions ci/lint/06_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

export LC_ALL=C

if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE
fi

if [ "$EVENT_TYPE" = "pull_request" ]; then
test/lint/commit-script-check.sh $(git rev-parse HEAD~$COMMIT_COUNT)..$GITHUB_SHA
Expand All @@ -22,8 +19,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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion test/lint/lint-whitespace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ if showcodediff | perl -nle '$MATCH++ if m{^\+.*\t}; END{exit 1 unless $MATCH>0}
RET=1
fi

exit $RET
exit $RET