8000 Merge pull request #26 from Arduino-CI/2023-06-08_candidate · Arduino-CI/action@b20e463 · GitHub
[go: up one dir, main page]
Skip to content

Commit b20e463

Browse files
ianfixesianfixes
authored
Merge pull request #26 from Arduino-CI/2023-06-08_candidate
Adopt latest patch of arduino_ci
2 parents d5dac65 + 0136ecc commit b20e463

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2222

2323
## [0.1.6] - 2023-06-08
2424
### Changed
25-
- Now uses `arduino_ci` [version `1.6.1`](https://github.com/Arduino-CI/arduino_ci/blob/master/CHANGELOG.md#161---2023-06-08)
25+
- Now uses `arduino_ci` [version `1.6.2`](https://github.com/Arduino-CI/arduino_ci/blob/master/CHANGELOG.md#162---2023-06-08)
2626

2727
## [0.1.5] - 2023-01-23
2828
### Added

‎Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ ARG BUILD_REVISION
66
ARG BUILD_VERSION
77

88
# Values we set in more than one place in this file
9-
ARG ARDUINO_CI_VERSION=1.6.1
9+
ARG ARDUINO_CI_VERSION=1.6.2
1010
ARG ARDUINO_CI_ACTION_REPO="https://github.com/ArduinoCI/action"
1111
ARG ARDUINO_CI_MAINTAINER="Arduino Continuous Integration <arduino.continuous.integration@gmail.com>"
1212

13-
## IF USING A RELEASED GEM
13+
## IF USING A RELEASED GEM - also check lower in the file
1414
ARG ARDUINO_CI_GITREPO="https://github.com/Arduino-CI/arduino_ci.git"
1515
ARG ARDUINO_CI_GITREF="tag: 'v$ARDUINO_CI_VERSION'"
1616
## ELSE
@@ -46,6 +46,7 @@ ENV BUILD_DATE=$BUILD_DATE \
4646
ENV BUNDLE_GEMFILE=/action/Gemfile \
4747
DEBIAN_FRONTEND=noninteractive
4848

49+
# Note that python is installed not because we need it but because Arduino platforms need it
4950
RUN true \
5051
&& apt-get update \
5152
&& apt-get install -qq --no-install-recommends \
@@ -66,8 +67,11 @@ RUN true \
6667
RUN true \
6768
&& mkdir -p /action/bundle \
6869
&& echo "source 'https://rubygems.org'" > $BUNDLE_GEMFILE \
69-
&& echo "gem 'arduino_ci', git: '$ARDUINO_CI_GITREPO', $ARDUINO_CI_GITREF" >> $BUNDLE_GEMFILE \
70-
# && echo "gem 'arduino_ci', '=$ARDUINO_CI_VERSION'" >> $BUNDLE_GEMFILE \
70+
## IF USING A RELEASED GEM
71+
&& echo "gem 'arduino_ci', '=$ARDUINO_CI_VERSION'" >> $BUNDLE_GEMFILE \
72+
## ELSE
73+
# && echo "gem 'arduino_ci', git: '$ARDUINO_CI_GITREPO', $ARDUINO_CI_GITREF" >> $BUNDLE_GEMFILE \
74+
## END
7175
&& cat $BUNDLE_GEMFILE \
7276
&& bundle install --gemfile /action/Gemfile --path /action/bundle \
7377
&& find /action |grep arduino_ci.rb

0 commit comments

Comments
 (0)
0