Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SRGDamia1 committed Sep 14, 2023
2 parents 49453bb + 7b9a88c commit d1ebc5e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
name: Check that all classes are documented in the menu-a-la-carte example

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

steps:
# check out the ModularSensors repo
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: code_docs/ModularSensors

Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
# check out my fork of m.css, for processing Doxygen output
- name: Checkout m.css
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Repository name with owner. For example, actions/checkout
repository: SRGDamia1/m.css
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
pio_job_matrix: ${{ steps.py_matrix.outputs.pio_job_matrix }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
library_install_git: ${{ steps.store_vars.outputs.library_install_git }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set environment variables for pushes to any branch in EnviroDIY/ModularSensors
if: github.event_name == 'push'
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
job_info: ${{ fromJSON(needs.generate_matrix.outputs.arduino_job_matrix) }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Unused Step
run: echo "This is needed to make the step number match with the PlatformIO jobs. =)"
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
job_info: ${{ fromJSON(needs.generate_matrix.outputs.pio_job_matrix) }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog_reminder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Changelog Reminder
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set environment variable for current library version
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify_library_structure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run Arduino-Lint to verify the library structure and syntax for the Arduino IDE
id: validate_library
Expand Down

0 comments on commit d1ebc5e

Please sign in to comment.