Skip to content

Commit

Permalink
Merge pull request kata-containers#5532 from jepio/jepio/remove-travis
Browse files Browse the repository at this point in the history
CC | ci: replace $TRAVIS with $GITHUB_ACTION in setup
  • Loading branch information
stevenhorsman authored Mar 17, 2023
2 parents f199bfd + a99f765 commit 67cb606
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ install_extra_tools() {
main() {
local setup_type="default"

# Travis only needs a very basic setup
# github-actions only needs a very basic setup
set +o nounset
[ "$TRAVIS" = "true" ] && setup_type="minimal"
[ -n "$GITHUB_ACTION" ] && setup_type="minimal"
set -o nounset

[ "$setup_type" = "default" ] && bash -f "${cidir}/install_go.sh" -p -f
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ jobs:
runs-on: ubuntu-20.04
env:
GO111MODULE: off
TRAVIS: "true"
TRAVIS_BRANCH: ${{ github.base_ref }}
TRAVIS_PULL_REQUEST_BRANCH: ${{ github.head_ref }}
TRAVIS_PULL_REQUEST_SHA : ${{ github.event.pull_request.head.sha }}
GITHUB_USER : ${{ secrets.GITHUB_USER }}
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
steps:
Expand All @@ -32,10 +28,6 @@ jobs:
gopath_org=$(go env GOPATH)/src/github.com/kata-containers/
mkdir -p ${gopath_org}
ln -s ${PWD} ${gopath_org}
echo "TRAVIS_BRANCH: ${TRAVIS_BRANCH}"
echo "TRAVIS_PULL_REQUEST_BRANCH: ${TRAVIS_PULL_REQUEST_BRANCH}"
echo "TRAVIS_PULL_REQUEST_SHA: ${TRAVIS_PULL_REQUEST_SHA}"
echo "TRAVIS: ${TRAVIS}"
- name: Set env
if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }}
run: |
Expand All @@ -47,10 +39,6 @@ jobs:
with:
fetch-depth: 0
path: ./src/github.com/${{ github.repository }}
- name: Setup travis references
if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }}
run: |
echo "TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = \"/\" } ; { print $3 }')}"
- name: Install dependencies
if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }}
run: |
Expand Down

0 comments on commit 67cb606

Please sign in to comment.