Merge pull request #24 from ianfixes/2023-01-23_v1.5.0

Use v1.5.0

Author: ianfixes

.github/workflows/docker_build.yml

@@ -0,0 +1,17 @@
+# via https://docs.github.com/en/free-pro-team@latest/actions/guides/publishing-docker-images
+# and https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#example-using-multiple-events-with-activity-types-or-configuration
+name: Build Docker image
+on: [push, pull_request]
+
+jobs:
+  just_build:
+    name: Verify the image can build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      - name: Verify Docker build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: false

.github/workflows/docker_push.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Push to GitHub Packages
         uses: docker/build-push-action@v1
         with:

.github/workflows/hadolint.yml

@@ -7,7 +7,7 @@ jobs:
   hadolint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: reviewdog/action-hadolint@v1
         with:
           github_token: ${{ secrets.github_token }}

CHANGELOG.md

@@ -7,8 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- ~~Pre-installation of platforms declared in `default.yml`~~
 
 ### Changed
+- Now uses `arduino_ci` [version `1.5.0`](https://github.com/Arduino-CI/arduino_ci/blob/master/CHANGELOG.md#150---2023-01-17)
 
 ### Deprecated
 
@@ -19,7 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Security
 
 
-## [Unreleased]
+## [0.1.3] - 2013-01-13
 ### Changed
 - Now uses `arduino_ci` [version `1.3.0`](https://github.com/Arduino-CI/arduino_ci/blob/master/CHANGELOG.md#130---2021-01-13)
 

Dockerfile

@@ -8,8 +8,8 @@ ARG BUILD_VERSION
 # Values we set in more than one place in this file
 ARG ARDUINO_CI_ACTION_REPO="https://github.com/ArduinoCI/action"
 ARG ARDUINO_CI_MAINTAINER="Arduino Continuous Integration <arduino.continuous.integration@gmail.com>"
-ARG ARDUINO_CI_GITREPO="https://github.com/ArduinoCI/arduino_ci.git"
-ARG ARDUINO_CI_GITREF="tag: 'v1.3.0'"
+ARG ARDUINO_CI_GITREPO="https://github.com/Arduino-CI/arduino_ci.git"
+ARG ARDUINO_CI_GITREF="tag: 'v1.5.0'"
 #ARG ARDUINO_CI_GITREPO="https://github.com/ianfixes/arduino_ci.git"
 #ARG ARDUINO_CI_GITREF="branch: '2021-01-07_beta'"
 
@@ -45,10 +45,10 @@ RUN true \
       curl \
       g++ \
       time \
-      python \
-      python-pip \
+      jq \
       python3 \
       python3-pip \
+      python3-yaml \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && pip install pyserial \
@@ -73,5 +73,17 @@ RUN curl -fsSL "https://raw.githubusercontent.com/arduino/arduino-cli/master/ins
   && echo "Now running arduino ensure_arduino_installation.rb" \
   && bundle exec time /action/bundle/ruby/2.6.0/bin/ensure_arduino_installation.rb
 
+# # Install common platforms by converting YAML to JSON and generating installation commands to run
+# #
+# # Although it seems wasteful to pull in python dependencies for just this, remember that (some) arduino
+# # platforms themselves require python to be available on the host, so we are taking advantage of a
+# # package that is already required.
+# RUN true \
+#   && python3 -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout)' < $(bundle show arduino_ci)/misc/default.yml \
+#   | jq -r '.packages | to_entries[] \
+#            | "arduino-cli core install \(.key) --additional-urls \(.value.url)"' \
+#   | sh
+
+
 # Just like that
 ENTRYPOINT ["bundle", "exec", "/action/bundle/ruby/2.6.0/bin/arduino_ci.rb"]