Skip to content

Commit 20c9edb

Browse files
authored
Merge branch 'adafruit:main' into master
2 parents 8f4dad8 + 37b9f77 commit 20c9edb

File tree

26 files changed

+459
-165
lines changed

26 files changed

+459
-165
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,9 @@ jobs:
6767
run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
6868
- name: Set base sha (pull)
6969
if: github.event_name == 'pull_request'
70-
run: |
71-
git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
72-
echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
70+
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
7371
env:
74-
DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
72+
SHA: ${{ steps.get-last-commit-with-checks.outputs.commit_sha || github.event.pull_request.base.sha }}
7573
- name: Set head sha (push)
7674
if: github.event_name == 'push'
7775
run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
@@ -80,16 +78,11 @@ jobs:
8078
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
8179
env:
8280
SHA: ${{ github.event.before }}
83-
- name: Get changes
84-
id: get-changes
85-
if: env.BASE_SHA && env.HEAD_SHA
86-
run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
8781
- name: Set matrix
8882
id: set-matrix
8983
run: python3 -u ci_set_matrix.py
9084
working-directory: tools
9185
env:
92-
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
9386
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
9487

9588
tests:

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build:
1414
python: "3"
1515
jobs:
1616
post_install:
17-
- python tools/ci_fetch_deps.py build-doc
17+
- python tools/ci_fetch_deps.py docs
1818

1919
formats:
2020
- pdf

0 commit comments

Comments
 (0)