Skip to content

Commit

Permalink
ci: Rework static checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stevenhorsman committed Oct 10, 2024
1 parent 00128d3 commit 45f72f3
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 92 deletions.
25 changes: 0 additions & 25 deletions .ci/lib.sh

This file was deleted.

11 changes: 0 additions & 11 deletions .ci/run.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/setup.sh

This file was deleted.

25 changes: 23 additions & 2 deletions .ci/static-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,28 @@

set -e

cidir=$(dirname "$0")
source "${cidir}/lib.sh"
export kata_repo="${kata_repo:-github.com/kata-containers/kata-containers}"
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
54 changes: 17 additions & 37 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,22 @@
on: ["pull_request"]
name: Static checks
jobs:
test:
runs-on: ubuntu-latest
static-checks:
runs-on: ubuntu-22.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 }}
GOPATH: ${{ github.workspace }}
steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.19.3
- name: Setup GOPATH
run: |
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: Checkout code
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
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
path: ./src/github.com/${{ github.repository }}

- name: Install system dependencies
run: |
sudo apt-get -y install moreutils hunspell hunspell-en-gb hunspell-en-us pandoc
- name: Running static checks
run: |
export PATH=${PATH}:${GOPATH}/bin
./src/github.com/${{ github.repository }}/.ci/static-checks.sh

0 comments on commit 45f72f3

Please sign in to comment.