Skip to content

Commit d06d067

Browse files
author
Vladimir Kotal
committed
cleanup Travis references
1 parent 5067634 commit d06d067

File tree

6 files changed

+9
-39
lines changed

6 files changed

+9
-39
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
run: ./dev/before
2626
- name: Build
2727
env:
28+
OPENGROK_PULL_REQUEST: ${{ github.head_ref }}
2829
OPENGROK_REPO_SLUG: ${{ github.repository }}
2930
OPENGROK_REF: ${{ github.ref }}
3031
run: ./dev/main
@@ -50,6 +51,7 @@ jobs:
5051
run: ./dev/before
5152
- name: Build
5253
env:
54+
OPENGROK_PULL_REQUEST: ${{ github.head_ref }}
5355
OPENGROK_REPO_SLUG: ${{ github.repository }}
5456
OPENGROK_REF: ${{ github.ref }}
5557
run: ./dev/main

dev/before

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#!/bin/bash
22

3-
# Windows on Travis does not obfuscate environment variables.
4-
if [[ $TRAVIS_OS_NAME != "windows" ]]; then
5-
echo "Environment variables:"
6-
env | sort
7-
fi
8-
93
echo "SCM versions:"
104
if command -v bk; then bk --version; fi
115
if command -v hg; then hg --version; fi

dev/before_install

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [[ "$TRAVIS_OS_NAME" == "linux" || "$RUNNER_OS" == "Linux" ]]; then
3+
if [[ "$RUNNER_OS" == "Linux" ]]; then
44
sudo apt-get update -qq
55
if [[ $? != 0 ]]; then
66
echo "cannot update"
@@ -36,16 +36,13 @@ if [[ "$TRAVIS_OS_NAME" == "linux" || "$RUNNER_OS" == "Linux" ]]; then
3636
exit 1
3737
fi
3838

39-
# We only need to preserve TRAVIS_OS_NAME but older sudo do not
40-
# support argument to --preserve-env.
41-
sudo --preserve-env ./dev/install-universal_ctags.sh
39+
sudo ./dev/install-universal_ctags.sh
4240
if [[ $? != 0 ]]; then
4341
echo "cannot install Universal ctags"
4442
exit 1
4543
fi
4644

47-
elif [[ "$TRAVIS_OS_NAME" == "osx" || "$RUNNER_OS" == "macOS" ]]; then
48-
# brew update
45+
elif [[ "$RUNNER_OS" == "macOS" ]]; then
4946
export HOMEBREW_NO_AUTO_UPDATE=1
5047

5148
brew install cvs libgit2 jq autoconf automake
@@ -63,9 +60,7 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" || "$RUNNER_OS" == "macOS" ]]; then
6360
exit 1
6461
fi
6562

66-
# We only need to preserve TRAVIS_OS_NAME but older sudo do not
67-
# support argument to --preserve-env.
68-
sudo --preserve-env ./dev/install-universal_ctags.sh
63+
sudo ./dev/install-universal_ctags.sh
6964
if [[ $? != 0 ]]; then
7065
echo "cannot install Universal ctags"
7166
exit 1

dev/before_install.windows

Lines changed: 0 additions & 21 deletions
This file was deleted.

dev/javadoc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ echo -e "Publishing javadoc to $BRANCH...\n"
1919

2020
./mvnw -DskipTests=true site
2121

22-
git config --global user.email "[email protected]"
23-
git config --global user.name "travis-ci"
22+
git config --global user.email "[email protected]"
23+
git config --global user.name "Foo Bar"
2424
git clone --quiet --branch=$BRANCH \
2525
https://${GH_PAGES_TOKEN}@github.com/oracle/opengrok "$BRANCH"
2626

dev/main

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [[ "x$OPENGROK_REPO_SLUG" == "xoracle/opengrok" && "x$OPENGROK_BRANCH" == "xm
1818
#
1919
# Sonar seems to only work on master branch commits.
2020
#
21-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
21+
if [ "${OPENGROK_PULL_REQUEST}" = "false" ]; then
2222
echo "Enabling Sonar"
2323
extra_args="$extra_args sonar:sonar"
2424
fi

0 commit comments

Comments
 (0)