Skip to content

Commit 85d5b9e

Browse files
committed
feat: move initial template checkout back into the primary workflows to ensure that the reusable workflow exists and is checked out prior to attempting to reference it
1 parent 51cc71a commit 85d5b9e

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ on:
44
branches:
55
- develop
66

7+
env:
8+
COOKIECUTTER_ROBUST_PYTHON__DEMOS_CACHE_FOLDER: ${{ github.workspace }}
9+
COOKIECUTTER_ROBUST_PYTHON__APP_AUTHOR: ${{ github.repository_owner }}
10+
ROBUST_PYTHON_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
11+
ROBUST_MATURIN_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
12+
713
jobs:
814
merge-demo-feature:
915
name: Merge Demo Feature
@@ -14,6 +20,12 @@ jobs:
1420
- "robust-python-demo"
1521
- "robust-maturin-demo"
1622
steps:
23+
- name: Checkout Template
24+
uses: actions/checkout@v4
25+
with:
26+
repository: ${{ github.repository }}
27+
path: cookiecutter-robust-python
28+
1729
- name: Sync Demo
1830
uses: "./.github/workflows/update-demo.yml"
1931
with:

.github/workflows/sync-demos.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ on:
44
branches:
55
- develop
66

7-
env:
8-
COOKIECUTTER_ROBUST_PYTHON__DEMOS_CACHE_FOLDER: ${{ github.workspace }}
9-
COOKIECUTTER_ROBUST_PYTHON__APP_AUTHOR: ${{ github.repository_owner }}
10-
ROBUST_PYTHON_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
11-
ROBUST_MATURIN_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
12-
137
jobs:
148
update-demo:
159
name: Update Demo
@@ -21,7 +15,13 @@ jobs:
2115
- "robust-python-demo"
2216
- "robust-maturin-demo"
2317
steps:
24-
- name: Sync Demo
18+
- name: Checkout Template
19+
uses: actions/checkout@v4
20+
with:
21+
repository: ${{ github.repository }}
22+
path: cookiecutter-robust-python
23+
24+
- name: Update Demo
2525
uses: "./.github/workflows/update-demo.yml"
2626
with:
2727
demo_name: ${{ matrix.demo_name }}

.github/workflows/update-demo.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
required: true
77
type: string
88

9+
env:
10+
COOKIECUTTER_ROBUST_PYTHON__DEMOS_CACHE_FOLDER: ${{ github.workspace }}
11+
COOKIECUTTER_ROBUST_PYTHON__APP_AUTHOR: ${{ github.repository_owner }}
12+
ROBUST_PYTHON_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
13+
ROBUST_MATURIN_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
14+
915
jobs:
1016
update-demo:
1117
runs-on: ubuntu-latest
1218
steps:
13-
- name: Checkout Template
14-
uses: actions/checkout@v4
15-
with:
16-
repository: ${{ github.repository }}
17-
path: cookiecutter-robust-python
18-
1919
- name: Checkout Demo
2020
uses: actions/checkout@v4
2121
with:

0 commit comments

Comments
 (0)