Skip to content

Use v1.5.0 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/docker_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)

Expand Down
20 changes: 16 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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'"

Expand Down Expand Up @@ -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 \
Expand All @@ -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"]