Skip to content

Commit

Permalink
Merge branch 'test/ceedling_0_32_rc' into test/0_32/merge_proj_file_c…
Browse files Browse the repository at this point in the history
…hanges_and_rc
  • Loading branch information
mvandervoord committed Apr 9, 2024
2 parents 75ebea4 + 313385e commit 9edef24
Show file tree
Hide file tree
Showing 54 changed files with 2,039 additions and 709 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.7', '3.0', '3.1', '3.2']
ruby: ['3.0', '3.1', '3.2']
steps:
# Use a cache for our tools to speed up testing
- uses: actions/cache@v3
Expand Down Expand Up @@ -104,6 +104,13 @@ jobs:
rake
cd ../..
# Run Dependencies Plugin Tests
- name: Run Tests On Dependency Plugin
run: |
cd plugins/dependencies
rake
cd ../..
# Job: Automatic Minor Releases
auto-release:
name: "Automatic Minor Releases"
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ examples/blinky/build/
examples/blinky/vendor/
examples/temp_sensor/vendor/
examples/temp_sensor/build/
fff/examples/fff_example/build/
module_generator/example/build/
plugins/fff/examples/fff_example/build/
plugins/module_generator/example/build/
plugins/dependencies/example/boss/build/
plugins/dependencies/example/boss/third_party/
plugins/dependencies/example/supervisor/build/

ceedling.sublime-project
ceedling.sublime-workspace
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ library builds & dependency management, and more.

<br/>

# 🙋‍♀️ Need Help?
# 🙋‍♀️ Need Help? Want to Help?

* Found a bug or want to suggest a feature?
**[Submit an issue][ceedling-issues]** at this repo.
Expand All @@ -72,6 +72,10 @@ library builds & dependency management, and more.
* Paid training, customizations, and support contracts are avaialble by
**[contacting ThingamaByte][thingama-contact]**.

The ThrowTheSwitch community follows a **[code of conduct](docs/CODE_OF_CONDUCT.md)**.

Please familiarize yourself with our guideline for **[contributing](docs/CONTRIBUTING.md)** to this project, be it code, reviews, documentation, or reports.

Yes, work has begun on certified versions of the Ceedling suite of tools.
Again, [reach out to ThingamaByte][thingama-contact] for more.

Expand Down
148 changes: 73 additions & 75 deletions assets/project_as_gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
# :naming: :snake #options: :bumpy, :camel, :caps, or :snake
# :includes:
# :tst: []
# :src: []:module_generator:
# :src: []
# :boilerplates:
# :src: ""
# :inc: ""
Expand Down Expand Up @@ -257,80 +257,78 @@
# As [:tools] is blank, gcc will be used (so long as it's in your system path)
# See documentation to configure a given toolchain for use
# :tools:
# :test:
# :compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :fixture:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :includes_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :file_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :file_preprocessor_directives:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release:
# :compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_fixture:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_includes_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_file_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_file_preprocessor_directives:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# #These tools can be filled out when command_hooks plugin is enabled
# :pre_mock_preprocess
# :post_mock_preprocess
Expand Down
149 changes: 74 additions & 75 deletions assets/project_with_guts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
# :naming: :snake #options: :bumpy, :camel, :caps, or :snake
# :includes:
# :tst: []
# :src: []:module_generator:
# :src: []
# :boilerplates:
# :src: ""
# :inc: ""
Expand Down Expand Up @@ -256,85 +256,84 @@
# TOOLCHAIN CONFIGURATION
################################################################


#:tools:
# Ceedling defaults to using gcc for compiling, linking, etc.
# As [:tools] is blank, gcc will be used (so long as it's in your system path)
# See documentation to configure a given toolchain for use
# :tools:
# :test:
# :compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :fixture:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :includes_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :file_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :file_preprocessor_directives:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release:
# :compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_fixture:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_includes_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_file_preprocessor:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_file_preprocessor_directives:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :test_dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_compiler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_linker:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_assembler:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# :release_dependencies_generator:
# :executable:
# :arguments: []
# :name:
# :stderr_redirect: :auto
# :optional: FALSE
# #These tools can be filled out when command_hooks plugin is enabled
# :pre_mock_preprocess
# :post_mock_preprocess
Expand Down
Loading

0 comments on commit 9edef24

Please sign in to comment.