Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit 40577b4

Browse files
author
Pat Hickey
committed
CI: run make package on a parallel runner, so CI doesnt get longer
1 parent 28acfe5 commit 40577b4

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

.github/actions/test/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: 'Test Lucet'
22
description: 'run tests using standardized lucet development environment'
3+
inputs:
4+
target:
5+
description: "Makefile target to execute"
6+
required: true
37
runs:
48
using: 'docker'
59
image: '../../../Dockerfile'
@@ -11,4 +15,4 @@ runs:
1115
# rustup expects $HOME to be set to /root during `docker run` because thats what
1216
# it was set to during container creation. Actions clears $HOME so we set it here.
1317
# The test target of the Makefile is our standard CI.
14-
- 'export HOME=/root; make test'
18+
- 'export HOME=/root; make ${{ inputs.target }}'

.github/workflows/main.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,30 @@ jobs:
1313
# Testing uses the development environment Docker container.
1414
# This action builds the container and executes the test suite inside it.
1515
- uses: ./.github/actions/test
16+
with:
17+
target: test
18+
19+
- name: Ensure testing did not change sources
20+
run: git diff --exit-code
21+
22+
package:
23+
name: Package
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@master
27+
with:
28+
submodules: true
29+
30+
# Testing uses the development environment Docker container.
31+
# This action builds the container and executes the test suite inside it.
32+
- uses: ./.github/actions/test
33+
with:
34+
target: package
1635

1736
- name: Ensure testing did not change sources
1837
run: git diff --exit-code
1938

39+
2040
rustfmt:
2141
name: Rustfmt
2242
runs-on: ubuntu-16.04

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install-dev: build-dev
2121
@helpers/install.sh --unoptimized
2222

2323
.PHONY: test
24-
test: indent-check test-except-fuzz test-fuzz package
24+
test: indent-check test-except-fuzz test-fuzz
2525

2626
.PHONY: test-except-fuzz
2727
test-except-fuzz:

0 commit comments

Comments
 (0)