Skip to content

Commit

Permalink
Merge pull request #26 from Arduino-CI/2023-06-08_candidate
Browse files Browse the repository at this point in the history
Adopt latest patch of arduino_ci
  • Loading branch information
ianfixes authored Jun 8, 2023
2 parents d5dac65 + 0136ecc commit b20e463
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

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

## [0.1.5] - 2023-01-23
### Added
Expand Down
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ ARG BUILD_REVISION
ARG BUILD_VERSION

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

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

# Note that python is installed not because we need it but because Arduino platforms need it
RUN true \
&& apt-get update \
&& apt-get install -qq --no-install-recommends \
Expand All @@ -66,8 +67,11 @@ RUN true \
RUN true \
&& mkdir -p /action/bundle \
&& echo "source 'https://rubygems.org'" > $BUNDLE_GEMFILE \
&& echo "gem 'arduino_ci', git: '$ARDUINO_CI_GITREPO', $ARDUINO_CI_GITREF" >> $BUNDLE_GEMFILE \
# && echo "gem 'arduino_ci', '=$ARDUINO_CI_VERSION'" >> $BUNDLE_GEMFILE \
## IF USING A RELEASED GEM
&& echo "gem 'arduino_ci', '=$ARDUINO_CI_VERSION'" >> $BUNDLE_GEMFILE \
## ELSE
# && echo "gem 'arduino_ci', git: '$ARDUINO_CI_GITREPO', $ARDUINO_CI_GITREF" >> $BUNDLE_GEMFILE \
## END
&& cat $BUNDLE_GEMFILE \
&& bundle install --gemfile /action/Gemfile --path /action/bundle \
&& find /action |grep arduino_ci.rb
Expand Down

0 comments on commit b20e463

Please # to comment.