From 0136eccb6cd9ab54f31cffdb3885c3ac68318a54 Mon Sep 17 00:00:00 2001 From: Ian Katz Date: Thu, 8 Jun 2023 10:49:09 -0400 Subject: [PATCH] explicit instructions about released vs branch --- CHANGELOG.md | 2 +- Dockerfile | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3774a7..c2898f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index 504d3e1..c795c76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 " -## 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 @@ -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 \ @@ -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