Skip to content

Commit

Permalink
Adds merge_group to CI/CD events
Browse files Browse the repository at this point in the history
  • Loading branch information
mrharpo committed Mar 20, 2024
1 parent d8049de commit 5a4f7ef
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- main
release:
types: [published, edited, prereleased]
merge_group:
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🧪 Integration Tests

on: [push, pull_request, workflow_dispatch]
on: [push, pull_request, merge_group, workflow_dispatch]

jobs:
tests:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📰 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 📲 Setup PDM
uses: pdm-project/setup-pdm@v3
uses: pdm-project/setup-pdm@v4
id: setup-python
with:
python-version: 3.x
Expand All @@ -26,7 +26,7 @@ jobs:
run: pdm build

- name: 🛫 Export build files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand All @@ -40,7 +40,7 @@ jobs:
id-token: write
steps:
- name: 🛬 Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: 🗞 Publish package
uses: pypa/gh-action-pypi-publish@release/v1

0 comments on commit 5a4f7ef

Please sign in to comment.