Skip to content

Commit 7fec0f2

Browse files
committed
Merge branch 'breakup-workflows' into test-breakup-workflows
2 parents 6501439 + 2537df0 commit 7fec0f2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/actions/prepare-workflow/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ runs:
1818
sudo chown -R testbot:testbot /home/testbot/.cache
1919
sudo mkdir -p /github/home/.npm
2020
sudo chown -R testbot:testbot /github/home/.npm
21+
sudo mkdir -p /github/home/.cache
22+
sudo chown -R testbot:testbot /github/home/.cache
2123
2224
- name: Setup Node.js
2325
uses: actions/setup-node@v6
@@ -46,9 +48,9 @@ runs:
4648
path: node_modules
4749
key: node-modules-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
4850

49-
- name: Generate api-version.ts
51+
- name: Prebuild
5052
shell: bash
51-
run: sudo -E -u testbot bash -lc 'node ./scripts/write-versions.js'
53+
run: sudo -E -u testbot bash -lc 'npm run prebuild'
5254

5355
- name: Download build artifacts
5456
if: inputs.e2e == 'true'

Makefile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,25 @@ setup: $(node_modules)
1313
teardown:
1414
rm -rf node_modules
1515

16-
.PHONY: _build
17-
_build: build-js build-docs
18-
1916
.PHONY: build
20-
build: build-buf _build
17+
build: build-buf build-js build-docs
2118

2219
.PHONY: build-ci
23-
build-ci: _build
20+
build-ci:
21+
npm run build
22+
npm run doc
23+
2424

2525
.PHONY: clean
2626
clean: clean-js clean-buf clean-docs
2727

28-
.PHONY: _test
29-
_test:
30-
npm run test
31-
3228
.PHONY: test
33-
test: $(node_modules) build-buf _test
29+
test: $(node_modules) build-buf
30+
npm run test
3431

3532
.PHONY: test-ci
36-
test-ci: _test
33+
test-ci:
34+
npm run test
3735

3836
.PHONY: test-watch
3937
test-watch: $(node_modules) build-buf

0 commit comments

Comments
 (0)