Skip to content

Commit

Permalink
Merge pull request #163 from jrha/ci-tests
Browse files Browse the repository at this point in the history
workflows: Update and make consistent with template-library-core
  • Loading branch information
jrha authored Sep 10, 2024
2 parents 9138b7d + 0b0d087 commit 9400e1f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 10 deletions.
8 changes: 8 additions & 0 deletions .ci-scripts/indent
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -e # halt script on error

rm -f /tmp/indent.py
wget -q https://raw.githubusercontent.com/stfc/Pan-Indenter/master/pan_indent_checker.py -O /tmp/indent.py
chmod u+x /tmp/indent.py

git diff --name-only HEAD^ | grep '\.pan$' | xargs -r /tmp/indent.py check || exit 1
32 changes: 22 additions & 10 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,50 @@ name: Run Tests
on: [push, pull_request]

jobs:

test-library:
runs-on: ubuntu-latest
container: centos:7
container: ghcr.io/quattor/quattor-test-container:latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install dependencies
run: yum -y install wget subversion git
- name: Setup Java JDK
uses: actions/[email protected]
with:
java-version: 11
distribution: adopt
run: dnf -y install subversion
- name: run tests
run: .ci-scripts/test-library
env:
TRAVIS_BUILD_DIR: "$GITHUB_WORKSPACE"
TRAVIS_REPO_SLUG: "$GITHUB_REPOSITORY"
TRAVIS_BRANCH: "${GITHUB_HEAD_REF:-master}"

panlint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# we need the full repo or HEAD^ does not work
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3
- name: Install dependencies
run: pip install colorama prettytable six
- name: run panlint
run: .ci-scripts/panlint

indentation:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
# we need the full repo or HEAD^ does not work
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3
- name: run indent checker
run: .ci-scripts/indent

0 comments on commit 9400e1f

Please sign in to comment.