Skip to content

Commit

Permalink
Merge branch 'main' into feat/expressjs
Browse files Browse the repository at this point in the history
  • Loading branch information
yanksyoon authored Dec 23, 2024
2 parents dc367d1 + 8ea35b0 commit f814e75
Show file tree
Hide file tree
Showing 54 changed files with 3,959 additions and 1,441 deletions.
8 changes: 0 additions & 8 deletions .bumpversion.cfg

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/policy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Check policy
on:
pull_request:
push:
branches:
- main
- hotfix/*
- work/check-policy # For development

jobs:
policy:
uses: canonical/starflow/.github/workflows/policy.yaml@main
python-scans:
name: Security scan
uses: canonical/starflow/.github/workflows/scan-python.yaml@main
with:
packages: python-apt-dev
# requirements-noble.txt can't build on jammy
requirements-find-args: '! -name requirements-noble.txt'
osv-extra-args: '--config=source/osv-scanner.toml'
uv-export: false
18 changes: 18 additions & 0 deletions .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: QA
on:
push:
branches:
- "main"
- "feature/*"
- "hotfix/*"
- "release/*"
- "renovate/*"
pull_request:

jobs:
lint:
uses: canonical/starflow/.github/workflows/lint-python.yaml@main
test:
uses: canonical/starflow/.github/workflows/test-python.yaml@main
with:
lowest-python-version: ""
20 changes: 14 additions & 6 deletions .github/workflows/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,30 @@ env:

jobs:
diff-schema:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout rockcraft
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up uv with caching
id: setup-uv
uses: astral-sh/setup-uv@v3
with:
enable-cache: true
cache-suffix: ${{ steps.runner-info.outputs.cache-hash }}

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Install requirements
run: pip install -r requirements.txt

- name: Run generator script
run: ./tools/schema/schema.py > generated_schema.json
run: |
uv run --frozen --no-dev --extra apt-jammy \
python tools/schema/schema.py > generated_schema.json
- name: Check with stored schema
run: |
Expand All @@ -49,4 +55,6 @@ jobs:

- name: Run ajv
run: |
ajv validate -s $ROCKCRAFT_JSON -d docs/reference/code/example/rockcraft.yaml --strict=false --spec=draft2020
ajv validate -s $ROCKCRAFT_JSON \
-d docs/reference/code/example/rockcraft.yaml \
--strict=false --spec=draft2020
16 changes: 0 additions & 16 deletions .github/workflows/security-scan.yaml

This file was deleted.

92 changes: 0 additions & 92 deletions .github/workflows/tests.yaml

This file was deleted.

26 changes: 26 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v5.0.0"
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- id: check-merge-conflict
- id: check-toml
- id: fix-byte-order-marker
- id: mixed-line-ending
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.8.3"
hooks:
# Run the linter
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
# Run the formatter
- id: ruff-format
- repo: https://github.com/adrienverge/yamllint.git
rev: "v1.35.1"
hooks:
- id: yamllint
3 changes: 2 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ sphinx:
# and requirements required to build your docs
python:
install:
- requirements: requirements-doc.txt
- method: pip
path: .
extra_requirements:
- docs
Loading

0 comments on commit f814e75

Please sign in to comment.