Skip to content

Commit f6c48b5

Browse files
committed
Remove -i; Add chainloader test to CI
1 parent ad70dcc commit f6c48b5

File tree

4 files changed

+50
-3
lines changed

4 files changed

+50
-3
lines changed

.github/workflows/test_xtra.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Xtra-Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths-ignore:
8+
- "utils/**"
9+
- "doc/**"
10+
- "docker/**"
11+
pull_request:
12+
branches:
13+
- master
14+
paths-ignore:
15+
- "utils/**"
16+
- "doc/**"
17+
- "docker/**"
18+
schedule:
19+
- cron: "0 5 * * *"
20+
21+
jobs:
22+
build:
23+
name: Run xtra tests
24+
runs-on: ubuntu-20.04
25+
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: Set up Ruby 2.x
29+
uses: actions/setup-ruby@v1
30+
with:
31+
ruby-version: "2.7"
32+
- name: Set up Rust nightly
33+
run: |
34+
rm rust-toolchain
35+
rustup self update
36+
rustup toolchain install nightly --component llvm-tools-preview
37+
rustup default nightly
38+
rustup target add aarch64-unknown-none-softfloat
39+
cargo install cargo-binutils
40+
- name: Set up Ruby
41+
run: |
42+
gem install bundler
43+
bundle config set without 'uart'
44+
bundle install --retry 3
45+
- name: Make all
46+
run: |
47+
bundle exec ruby utils/devtool.rb test_xtra

06_uart_chainloader/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ DOCKER_ARG_DIR_UTILS = -v $(shell pwd)/../utils:/work/utils
7070
DOCKER_ARG_DEV = --privileged -v /dev:/dev
7171

7272
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
73-
DOCKER_TEST = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
73+
DOCKER_TEST = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
7474
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
7575

7676
# Dockerize commands that require USB device passthrough only on Linux

06_uart_chainloader/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
157157
DOCKER_ARG_DEV = --privileged -v /dev:/dev
158158

159159
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
160-
+DOCKER_TEST = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
160+
+DOCKER_TEST = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
161161
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
162162

163163
# Dockerize commands that require USB device passthrough only on Linux

07_timestamps/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
8282
DOCKER_ARG_DEV = --privileged -v /dev:/dev
8383

8484
DOCKER_QEMU = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
85-
-DOCKER_TEST = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
85+
-DOCKER_TEST = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
8686
DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
8787

8888
# Dockerize commands that require USB device passthrough only on Linux

0 commit comments

Comments
 (0)