8000 Merge pull request #3 from espressif/master · brokentoaster/arduino-esp32@5664636 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5664636

Browse files
brokentoasterbrokentoaster
authored
Merge pull request #3 from espressif/master
Update from upstream master
2 parents 7614d3e + 8dc70e0 commit 5664636

File tree

187 files changed

+2097
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+2097
-643
lines changed

‎.github/scripts/on-release.sh

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,19 @@ mkdir -p "$PKG_DIR/tools"
171171

172172
# Copy all core files to the package folder
173173
echo "Copying files for packaging ..."
174-
cp -f "$GITHUB_WORKSPACE/boards.txt" "$PKG_DIR/"
175-
cp -f "$GITHUB_WORKSPACE/programmers.txt" "$PKG_DIR/"
176-
cp -Rf "$GITHUB_WORKSPACE/cores" "$PKG_DIR/"
177-
cp -Rf "$GITHUB_WORKSPACE/libraries" "$PKG_DIR/"
178-
cp -Rf "$GITHUB_WORKSPACE/variants" "$PKG_DIR/"
10000
179-
cp -f "$GITHUB_WORKSPACE/tools/espota.exe" "$PKG_DIR/tools/"
180-
cp -f "$GITHUB_WORKSPACE/tools/espota.py" "$PKG_DIR/tools/"
181-
cp -f "$GITHUB_WORKSPACE/tools/esptool.py" "$PKG_DIR/tools/"
182-
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.py" "$PKG_DIR/tools/"
183-
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.exe" "$PKG_DIR/tools/"
184-
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
185-
cp -Rf "$GITHUB_WORKSPACE/tools/sdk" "$PKG_DIR/tools/"
174+
cp -f "$GITHUB_WORKSPACE/boards.txt" "$PKG_DIR/"
175+
cp -f "$GITHUB_WORKSPACE/programmers.txt" "$PKG_DIR/"
176+
cp -Rf "$GITHUB_WORKSPACE/cores" "$PKG_DIR/"
177+
cp -Rf "$GITHUB_WORKSPACE/libraries" "$PKG_DIR/"
178+
cp -Rf "$GITHUB_WORKSPACE/variants" "$PKG_DIR/"
179+
cp -f "$GITHUB_WORKSPACE/tools/espota.exe" "$PKG_DIR/tools/"
180+
cp -f "$GITHUB_WORKSPACE/tools/espota.py" "$PKG_DIR/tools/"
181+
cp -f "$GITHUB_WORKSPACE/tools/esptool.py" "$PKG_DIR/tools/"
182+
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.py" "$PKG_DIR/tools/"
183+
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.exe" "$PKG_DIR/tools/"
184+
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
185+
cp -Rf "$GITHUB_WORKSPACE/tools/sdk" "$PKG_DIR/tools/"
186+
cp -f "$GITHUB_WORKSPACE/tools/platformio-build.py" "$PKG_DIR/tools/"
186187

187188
# Remove unnecessary files in the package folder
188189
echo "Cleaning up folders ..."
@@ -254,35 +255,43 @@ releasesJson=`curl -sH "Authorization: token $GITHUB_TOKEN" "https://api.github.
254255
if [ $? -ne 0 ]; then echo "ERROR: Get Releases Failed! ($?)"; exit 1; fi
255256

256257
set +e
257-
prev_release=$(echo "$releasesJson" | jq -e -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name')
258-
prev_any_release=$(echo "$releasesJson" | jq -e -r '. | map(select(.draft == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name')
258+
prev_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false)) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
259+
prev_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false)) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
260+
prev_branch_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
261+
prev_branch_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
259262
shopt -s nocasematch
263+
if [ "$prev_release" == "$RELEASE_TAG" ]; then
264+
prev_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false)) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
265+
fi
260266
if [ "$prev_any_release" == "$RELEASE_TAG" ]; then
261-
prev_release=$(echo "$releasesJson" | jq -e -r '. | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[1].tag_name')
262-
prev_any_release=$(echo "$releasesJson" | jq -e -r '. | map(select(.draft == false)) | sort_by(.created_at | - fromdateiso8601) | .[1].tag_name')
267+
prev_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false)) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
268+
fi
269+
if [ "$prev_branch_release" == "$RELEASE_TAG" ]; then
270+
prev_branch_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
271+
fi
272+
if [ "$prev_branch_any_release" == "$RELEASE_TAG" ]; then
273+
prev_branch_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
263274
fi
264-
COMMITS_SINCE_RELEASE="$prev_any_release"
265275
shopt -u nocasematch
266276
set -e
267277

278+
echo "Previous Release: $prev_release"
279+
echo "Previous (any)release: $prev_any_release"
280+
echo
281+
268282
# Merge package JSONs with previous releases
269283
if [ ! -z "$prev_any_release" ] && [ "$prev_any_release" != "null" ]; then
270284
echo "Merging with JSON from $prev_any_release ..."
271285
merge_package_json "$prev_any_release/$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"
272286
fi
273287

274288
if [ "$RELEASE_PRE" == "false" ]; then
275-
COMMITS_SINCE_RELEASE="$prev_release"
276289
if [ ! -z "$prev_release" ] && [ "$prev_release" != "null" ]; then
277290
echo "Merging with JSON from $prev_release ..."
278291
merge_package_json "$prev_release/$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"
279292
fi
280293
fi
281294

282-
echo "Previous Release: $prev_release"
283-
echo "Previous (any)release: $prev_any_release"
284-
echo
285-
286295
# Upload package JSONs
287296
echo "Uploading $PACKAGE_JSON_DEV ..."
288297
echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
@@ -327,21 +336,35 @@ if [ $arrLen > 3 ] && [ "${msgArray[0]:0:3}" == "tag" ]; then
327336
fi
328337

329338
# Append Commit Messages
339+
echo
340+
echo "Previous Branch Release: $prev_branch_release"
341+
echo "Previous Branch (any)release: $prev_branch_any_release"
342+
echo
343+
commitFile="$OUTPUT_DIR/commits.txt"
344+
COMMITS_SINCE_RELEASE="$prev_branch_any_release"
345+
if [ "$RELEASE_PRE" == "false" ]; then
346+
COMMITS_SINCE_RELEASE="$prev_branch_release"
347+
fi
330348
if [ ! -z "$COMMITS_SINCE_RELEASE" ] && [ "$COMMITS_SINCE_RELEASE" != "null" ]; then
331349
echo "Getting commits since $COMMITS_SINCE_RELEASE ..."
332-
commitFile=$OUTPUT_DIR/commits.txt
333-
git -C "$GITHUB_WORKSPACE" log --oneline "$COMMITS_SINCE_RELEASE..HEAD" > "$OUTPUT_DIR/commits.txt"
334-
releaseNotes+=$'\r\n##### Commits\r\n'
335-
IFS=$'\n'
336-
for next in `cat $commitFile`
337-
do
338-
IFS=' ' read -r commitId commitMsg <<< "$next"
339-
commitLine="- [$commitId](https://github.com/$GITHUB_REPOSITORY/commit/$commitId) $commitMsg"
340-
releaseNotes+="$commitLine"
341-
releaseNotes+=$'\r\n'
342-
done
343-
rm -f $commitFile
350+
git -C "$GITHUB_WORKSPACE" log --oneline -n 500 "$COMMITS_SINCE_RELEASE..HEAD" > "$commitFile"
351+
elif [ "$RELEASE_BRANCH" != "master" ]; then
352+
echo "Getting all commits on branch '$RELEASE_BRANCH' ..."
353+
git -C "$GITHUB_WORKSPACE" log --oneline -n 500 --cherry-pick --left-only --no-merges HEAD...origin/master > "$commitFile"
354+
else
355+
echo "Getting all commits on master ..."
356+
git -C "$GITHUB_WORKSPACE" log --oneline -n 500 --no-merges > "$commitFile"
344357
fi
358+
releaseNotes+=$'\r\n##### Commits\r\n'
359+
IFS=$'\n'
360+
for next in `cat $commitFile`
361+
do
362+
IFS=' ' read -r commitId commitMsg <<< "$next"
363+
commitLine="- [$commitId](https://github.com/$GITHUB_REPOSITORY/commit/$commitId) $commitMsg"
364+
releaseNotes+="$commitLine"
365+
releaseNotes+=$'\r\n'
366+
done
367+
rm -f $commitFile
345368

346369
# Prepend the original release body
347370
if [ "${RELEASE_BODY: -1}" == $'\r' ]; then

‎.github/stale.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ onlyLabels: []
1212

1313
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1414
exemptLabels:
15-
- pinned
16-
- security
17-
- "to be implemented"
18-
- "for reference"
19-
- "move to PR"
20-
- "enhancement"
15+
- "Type: For reference"
16+
- "Type: To be implemented"
17+
- "Type: Feature request"
2118

2219
# Set to true to ignore issues in a project (defaults to false)
2320
exemptProjects: false
@@ -29,7 +26,7 @@ exemptMilestones: false
2926
exemptAssignees: false
3027

3128
# Label to use when marking as stale
32-
staleLabel: stale
29+
staleLabel: Status: Stale
3330

3431
# Comment to post when marking as stale. Set to `false` to disable
3532
markComment: >

‎.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@master
14+
with:
15+
fetch-depth: 0
1416
- uses: actions/setup-python@v1
1517
with:
1618
python-version: '3.x'

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(CORE_SRCS
77
cores/esp32/esp32-hal-dac.c
88
cores/esp32/esp32-hal-gpio.c
99
cores/esp32/esp32-hal-i2c.c
10+
cores/esp32/esp32-hal-log.c
1011
cores/esp32/esp32-hal-ledc.c
1112
cores/esp32/esp32-hal-matrix.c
1213
cores/esp32/esp32-hal-misc.c

0 commit comments

Comments
 (0)
0