Skip to content

Commit 13bf965

Browse files
committed
fix: move reusable workflow usage to the job level and piece together portions to get things moving possibly
1 parent e74104f commit 13bf965

File tree

3 files changed

+33
-15
lines changed

3 files changed

+33
-15
lines changed

.github/workflows/merge-demo-feature.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ env:
1111
ROBUST_MATURIN_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
1212

1313
jobs:
14+
update-demo:
15+
name: Update Demo
16+
uses: ./.github/workflows/update-demo.yml
17+
strategy:
18+
matrix:
19+
demo_name:
20+
- "robust-python-demo"
21+
- "robust-maturin-demo"
22+
with:
23+
demo_name: ${{ matrix.demo_name }}
24+
1425
merge-demo-feature:
1526
name: Merge Demo Feature
1627
runs-on: ubuntu-latest
@@ -25,10 +36,20 @@ jobs:
2536
with:
2637
repository: ${{ github.repository }}
2738

28-
- name: Sync Demo
29-
uses: "./.github/workflows/update-demo.yml"
39+
- name: Checkout Demo
40+
uses: actions/checkout@v4
41+
with:
42+
repository: "${{ github.repository_owner }}/${{ inputs.demo_name }}"
43+
path: ${{ inputs.demo_name }}
44+
ref: develop
45+
46+
- name: Set up uv
47+
uses: astral-sh/setup-uv@v6
48+
49+
- name: Set up Python
50+
uses: actions/setup-python@v5
3051
with:
31-
demo_name: ${{ matrix.demo_name }}
52+
python-version-file: ".github/workflows/.python-version"
3253

3354
- name: Merge Demo Feature PR into Develop
3455
working-directory: "${{ github.workspace }}/${{ matrix.demo_name }}"

.github/workflows/sync-demos.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,11 @@ on:
77
jobs:
88
update-demo:
99
name: Update Demo
10-
runs-on: ubuntu-latest
11-
10+
uses: ./.github/workflows/update-demo.yml
1211
strategy:
1312
matrix:
1413
demo_name:
1514
- "robust-python-demo"
1615
- "robust-maturin-demo"
17-
steps:
18-
- name: Checkout Template
19-
uses: actions/checkout@v4
20-
with:
21-
repository: ${{ github.repository }}
22-
23-
- name: Update Demo
24-
uses: "./.github/workflows/update-demo.yml"
25-
with:
26-
demo_name: ${{ matrix.demo_name }}
16+
with:
17+
demo_name: ${{ matrix.demo_name }}

.github/workflows/update-demo.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ jobs:
1616
update-demo:
1717
runs-on: ubuntu-latest
1818
steps:
19+
- name: Checkout Template
20+
uses: actions/checkout@v4
21+
with:
22+
repository: ${{ github.repository }}
23+
path: "${{ github.workspace }}/cookiecutter-robust-python"
24+
1925
- name: Checkout Demo
2026
uses: actions/checkout@v4
2127
with:

0 commit comments

Comments
 (0)