Skip to content

Commit

Permalink
Update and simplify config
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Mar 5, 2021
1 parent 36fe42b commit 6d8eb0d
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 39 deletions.
23 changes: 19 additions & 4 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name-template: "$NEXT_PATCH_VERSION"
tag-template: "$NEXT_PATCH_VERSION"
name-template: "$RESOLVED_VERSION"
tag-template: "$RESOLVED_VERSION"

categories:
- title: "Added"
Expand All @@ -23,6 +23,21 @@ exclude-labels:
- "changelog: skip"

template: |
## Changes
$CHANGES
version-resolver:
major:
labels:
- "changelog: Removed"
minor:
labels:
- "changelog: Added"
- "changelog: Changed"
- "changelog: Deprecated"
- "enhancement"

patch:
labels:
- "changelog: Fixed"
- "bug"
default: minor
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ on:
jobs:
build:
if: github.repository == 'ultrajson/ultrajson'
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- run: |
git fetch --prune --unshallow
- name: Set up Python 3.8
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9

- name: Install dependencies
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: micnncim/action-label-syncer@v1
with:
prune: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34 changes: 3 additions & 31 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,11 @@ name: Lint

on: [push, pull_request]

env:
FORCE_COLOR: 1

jobs:
build:
lint:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2

- name: Cache
uses: actions/cache@v2
with:
path: |
~/.cache/pip
~/.cache/pre-commit
key:
lint-${{ hashFiles('**/setup.py') }}-${{
hashFiles('**/.pre-commit-config.yaml') }}
restore-keys: |
lint-
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U pre-commit
- name: Lint
run: pre-commit run --all-files
env:
PRE_COMMIT_COLOR: always
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,5 @@ jobs:
python -m pip install .
- name: Tests
shell: bash
run: |
pytest

0 comments on commit 6d8eb0d

Please sign in to comment.