Skip to content

Commit

Permalink
Merge pull request #531 from gaphor/remove-skip-check
Browse files Browse the repository at this point in the history
  • Loading branch information
amolenaar authored Jul 12, 2024
2 parents 4deb6fa + 8c84d42 commit 87ee5e7
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/constraints.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
poetry==1.8.0
poetry==1.8.3
27 changes: 5 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,18 @@ on:
types: [published]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
python-version: '3.12'

permissions:
contents: read

jobs:
skip-check:
permissions:
actions: write # for fkirc/skip-duplicate-actions to skip or stop workflow runs
contents: read # for fkirc/skip-duplicate-actions to read and compare commits
runs-on: ubuntu-latest
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
with:
egress-policy: audit

- id: skip_check
uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1
with:
concurrent_skipping: 'same_content'
do_not_skip: '["release", "workflow_dispatch", "schedule"]'
lint:
needs: skip-check
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
steps:
- name: Harden Runner
Expand All @@ -67,7 +51,6 @@ jobs:
build:
needs: lint
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down Expand Up @@ -109,7 +92,7 @@ jobs:
with:
coverageCommand: poetry run coverage xml
- name: Create Source Dist and Wheel
if: ${{ matrix.python-version == env.python.version }}
if: ${{ matrix.python-version == env.python-version }}
run: poetry build
- name: Upload generic-${{ steps.meta.outputs.version }}.tar.gz
if: ${{ matrix.python-version == env.python-version }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repos:
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.10.1
hooks:
- id: mypy
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-toml
- id: check-yaml
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.1.14'
rev: 'v0.5.1'
hooks:
- id: ruff
args: [--fix]
Expand Down
108 changes: 54 additions & 54 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 87ee5e7

Please sign in to comment.