Skip to content

Commit

Permalink
Merge pull request #180 from lsst/tickets/DM-42404
Browse files Browse the repository at this point in the history
DM-42404: Run Felis validation on schemas
  • Loading branch information
JeremyMcCormick committed Jan 18, 2024
2 parents beb0e17 + b016a1b commit 8ac3a39
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 50 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI
name: Build TAP Schema and Datalink

"on": [push]
on: push

jobs:
build:
Expand All @@ -11,17 +11,21 @@ jobs:

steps:
- name: Check out repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.12"
cache: "pip"

- name: Install dependencies
id: depend
run: pip install -r requirements.txt
# Only install Felis rather than using the separate requirements.txt,
# since the dependencies may conflict. Felis already includes all the
# required dependencies for the tap-schema build.
run: |
python -m pip install --upgrade pip
python -m pip install git+http://github.com/lsst/felis.git@main#egg=felis
working-directory: ./tap-schema

- name: Log in to Docker Hub
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/felislint.yaml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Validate SDM schemas using Felis

on: push

jobs:
validate:
runs-on: ubuntu-latest

steps:
- name: Check out repo
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.12"
cache: "pip"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install git+http://github.com/lsst/felis.git@main#egg=felis
- name: Validate YAML files
run: felis validate ./yml/*.yaml
6 changes: 1 addition & 5 deletions .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Lint YAML Files

on:
push:
branches:
- main
pull_request:
on: push

jobs:
call-workflow:
Expand Down
8 changes: 0 additions & 8 deletions tap-schema/felis-validate

This file was deleted.

0 comments on commit 8ac3a39

Please sign in to comment.