Skip to content

Commit 3cfcb26

Browse files
authored
Merge pull request #264 from milesburton/race-condition
fix: Fix race condition
2 parents 536e183 + 4e8486c commit 3cfcb26

13 files changed

+922
-1403
lines changed

.arduino-ci.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
compile:
2-
# Choosing to run compilation tests on 2 different Arduino platforms
32
platforms:
43
- uno
5-
- due
6-
# - zero # SAMD covered by M4
7-
# - leonardo # AVR covered by UNO
8-
- m4
9-
# - esp32 # errors on OneWire => util/crc16.h vs rom/crc.h
10-
- esp8266
11-
# - mega2560 # AVR covered by UNO
12-
unittest:
13-
# These dependent libraries will be installed
144
libraries:
155
- "OneWire"
6+
skip_unittest: true
7+
8+
aux_libraries_for_ci:
9+
- "OneWire"

.devcontainer/Dockerfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@ RUN chmod +x /usr/local/bin/update-libraries.sh
4646
# Add aliases for build operations
4747
RUN echo 'alias arduino-build="./build.sh build"' >> /home/vscode/.bashrc && \
4848
echo 'alias arduino-test="./build.sh test"' >> /home/vscode/.bashrc && \
49-
echo 'alias arduino-build-test="./build.sh all"' >> /home/vscode/.bashrc
49+
echo 'alias arduino-build-test="./build.sh all"' >> /home/vscode/.bashrc
50+
51+
# Add welcome message to .bashrc
52+
RUN echo '\n# Welcome to the dev container! Here are some useful aliases:' >> /home/vscode/.bashrc && \
53+
echo 'echo " - arduino-build: Build the project"' >> /home/vscode/.bashrc && \
54+
echo 'echo " - arduino-test: Run tests for the project"' >> /home/vscode/.bashrc && \
55+
echo 'echo " - arduino-build-test: Build and test the project"' >> /home/vscode/.bashrc

.devcontainer/arduino-cli.yaml

+15-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
board_manager:
2-
additional_urls:
3-
- https://arduino.esp8266.com/stable/package_esp8266com_index.json
4-
- https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
5-
daemon:
6-
port: "50051"
7-
directories:
8-
data: /root/.arduino15
9-
downloads: /root/.arduino15/staging
10-
user: /root/Arduino
11-
library:
12-
enable_unsafe_install: true
13-
logging:
14-
file: ""
15-
format: text
16-
level: info
17-
metrics:
18-
addr: :9090
19-
enabled: true
20-
sketch:
21-
always_export_binaries: false
1+
compile:
2+
# Choosing to run compilation tests on 2 different Arduino platforms
3+
platforms:
4+
- uno
5+
- due
6+
# - zero # SAMD covered by M4
7+
# - leonardo # AVR covered by UNO
8+
- m4
9+
# - esp32 # errors on OneWire => util/crc16.h vs rom/crc.h
10+
# - esp8266
11+
# - mega2560 # AVR covered by UNO
12+
unittest:
13+
# These dependent libraries will be installed
14+
libraries:
15+
- "OneWire"
+30-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,39 @@
1-
---
21
name: Arduino CI
32

43
on: [push, pull_request]
54

65
jobs:
7-
runTest:
6+
test:
87
runs-on: ubuntu-latest
9-
8+
109
steps:
1110
- uses: actions/checkout@v3
12-
- uses: ruby/setup-ruby@v1
11+
12+
- name: Create required directories
13+
run: |
14+
mkdir -p $GITHUB_WORKSPACE/libraries
15+
mkdir -p $GITHUB_WORKSPACE/.arduino15
16+
mkdir -p $GITHUB_WORKSPACE/Arduino
17+
18+
- name: Setup Arduino CLI
19+
uses: arduino/setup-arduino-cli@v1
20+
21+
- name: Configure Arduino CLI
22+
run: |
23+
arduino-cli config init
24+
arduino-cli config set library.enable_unsafe_install true
25+
arduino-cli core update-index
26+
arduino-cli core install arduino:avr
27+
28+
- name: Install OneWire library
29+
run: |
30+
arduino-cli lib install OneWire
31+
32+
- name: Set up Ruby
33+
uses: ruby/setup-ruby@v1
1334
with:
14-
ruby-version: 2.6
15-
- run: |
16-
gem install arduino_ci
17-
arduino_ci.rb
35+
ruby-version: '2.6'
36+
37+
- name: Install Arduino CI
38+
run: |
39+
gem install arduino_ci -v 1.5.0

0 commit comments

Comments
 (0)