ci: Rework static checks

The static checks were using the version from kata-containers,
an old version of go and had a bunch of travis references that
don't seem to be required any longer, so try updating this
and removing the redundant code.

Whether all these checks are useful is debatable, but at least
now they should be up-to-date.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2024-10-10 12:05:48 +01:00
parent 00128d3b92
commit 587c0d1b99
5 changed files with 41 additions and 93 deletions

View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2019 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
export tests_repo="${tests_repo:-github.com/kata-containers/tests}"
export tests_repo_dir="$GOPATH/src/$tests_repo"
clone_tests_repo()
{
# KATA_CI_NO_NETWORK is (has to be) ignored if there is
# no existing clone.
if [ -d "$tests_repo_dir" -a -n "$KATA_CI_NO_NETWORK" ]
then
return
fi
go get -d -u "$tests_repo" || true
}
run_static_checks()
{
clone_tests_repo
bash "$tests_repo_dir/.ci/static-checks.sh" "github.com/kata-containers/community"
}

View File

@ -1,11 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2019 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
set -e
# No explicit tests currently
true

View File

@ -1,17 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2019 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
set -e
cidir=$(dirname "$0")
source "${cidir}/lib.sh"
clone_tests_repo
pushd "${tests_repo_dir}"
.ci/setup.sh
popd

View File

@ -1,12 +1,33 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 2019 Intel Corporation # Copyright (c) 2024 IBM Corporation
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
set -e set -e
cidir=$(dirname "$0") export kata_repo="${kata_repo:-github.com/kata-containers/kata-containers}"
source "${cidir}/lib.sh" export kata_repo_dir="$GOPATH/src/$kata_repo"
export kata_default_branch="${kata_default_branch:-main}"
clone_kata_repo() {
if [ ! -d "${kata_repo_dir}" ]; then
mkdir -p "${kata_repo_dir}"
git clone "https://${kata_repo}.git" "${kata_repo_dir}"
pushd "${kata_repo_dir}" || exit
# Checkout to default branch
git checkout "${kata_default_branch}"
popd || exit
fi
}
run_static_checks()
{
clone_kata_repo
INSTALL_IN_GOPATH=false bash "${kata_repo_dir}/ci/install_yq.sh"
bash "${kata_repo_dir}/tests/install_go.sh" -f -p
bash "${kata_repo_dir}/tests/static-checks.sh" "github.com/kata-containers/community"
}
run_static_checks run_static_checks

View File

@ -1,42 +1,22 @@
on: ["pull_request"] on: ["pull_request"]
name: Static checks name: Static checks
jobs: jobs:
test: static-checks:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
env: env:
GO111MODULE: off GOPATH: ${{ github.workspace }}
TRAVIS: "true"
TRAVIS_BRANCH: ${{ github.base_ref }}
TRAVIS_PULL_REQUEST_BRANCH: ${{ github.head_ref }}
TRAVIS_PULL_REQUEST_SHA : ${{ github.event.pull_request.head.sha }}
steps: steps:
- name: Install Go - name: Checkout code
uses: actions/setup-go@v2 uses: actions/checkout@v4
with: with:
go-version: 1.19.3 fetch-depth: 0
- name: Setup GOPATH path: ./src/github.com/${{ github.repository }}
run: |
gopath_org=$(go env GOPATH)/src/github.com/kata-containers/ - name: Install system dependencies
mkdir -p ${gopath_org} run: |
ln -s ${PWD} ${gopath_org} sudo apt-get -y install moreutils hunspell hunspell-en-gb hunspell-en-us pandoc
echo "TRAVIS_BRANCH: ${TRAVIS_BRANCH}"
echo "TRAVIS_PULL_REQUEST_BRANCH: ${TRAVIS_PULL_REQUEST_BRANCH}" - name: Running static checks
echo "TRAVIS_PULL_REQUEST_SHA: ${TRAVIS_PULL_REQUEST_SHA}" run: |
echo "TRAVIS: ${TRAVIS}" export PATH=${GOPATH}/bin:${PATH}
- name: Checkout code ./src/github.com/${{ github.repository }}/.ci/static-checks.sh
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup travis references
run: |
echo "TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = \"/\" } ; { print $3 }')}"
- name: Setup
run: |
community_repo=$(go env GOPATH)/src/github.com/kata-containers/community
pushd ${community_repo}
GOPATH=$(go env GOPATH) .ci/setup.sh
- name: Running static checks
run: |
community_repo=$(go env GOPATH)/src/github.com/kata-containers/community
pushd ${community_repo}
GOPATH=$(go env GOPATH) .ci/static-checks.sh