Skip to content

Commit

Permalink
Merge branch 'main' into raise-python-level
Browse files Browse the repository at this point in the history
  • Loading branch information
ferdnyc authored Jun 12, 2024
2 parents a17313e + c82f30d commit 4ebfae2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/label-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later

name: "Label merge conflicts"
name: "Merge conflicts"
on:
# So that PRs touching the same files as the push are updated
push:
Expand All @@ -17,7 +17,7 @@ on:
types: [synchronize]

jobs:
conflicts:
label:
runs-on: ubuntu-latest
permissions:
pull-requests: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later

name: REUSE Verification
name: REUSE

on:
push:
Expand All @@ -14,7 +14,7 @@ on:
workflow_dispatch:

jobs:
lint:
verify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down

0 comments on commit 4ebfae2

Please sign in to comment.