Skip to content

Commit ebed5e1

Browse files
author
Robin Bryce
committed
ci: grinding away on the gh workflow steps
1 parent 6af9c33 commit ebed5e1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@ jobs:
1717
uses: arduino/setup-protoc@v2
1818
with:
1919
version: "24.3"
20-
- name: bootstrap
21-
run: |
22-
task apis:bootsrap
23-
24-
- name: generate
20+
- name: all ci steps
2521
run: |
22+
# Note: it is by design that we don't use the builder
23+
task apis:bootstrap
2624
task apis:generate
27-
2825
2926

Taskfile.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,20 @@ tasks:
6767
### -------------------------
6868
# Primary workflow tasks
6969
### -------------------------
70-
71-
bootstrap:
72-
desc: idempotent, run after first clone and after any significant re-base or update
70+
all:
71+
desc: "do everything necessary after clone (or rebase)"
7372
cmds:
74-
- echo {{.PROTO_INC_ROOT}}
75-
# - task apis:fetch-proto-def
73+
- task: builder-start
74+
- defer: {task: builder-cleanup}
75+
# These steps should exactly mirror the steps in .github/workflows/ci.yml
76+
- docker exec -t {{.BUILD_CONTAINER}} task apis:bootstrap
77+
- docker exec -t {{.BUILD_CONTAINER}} task apis:generate
7678

7779
# 2. generate
7880
generate:
7981
desc: generates all the artifacts we need pre-build
8082
cmds:
8183
- task: builder-start
8284
- defer: {task: builder-cleanup}
85+
# DO NOT add bootstrap here, use all instead
8386
- docker exec -t {{.BUILD_CONTAINER}} task apis:generate

0 commit comments

Comments
 (0)