Skip to content

Commit ea4be13

Browse files
lucasssvazlucasssvaz
committed
Revert "ci(actions): Replace changed-files (#11130)"
This reverts commit ba2ab1e.
1 parent e2915c4 commit ea4be13

File tree

4 files changed

+62
-120
lines changed

4 files changed

+62
-120
lines changed

‎.github/scripts/set_push_chunks.sh

+3-90
Original file line numberDiff line numberDiff line change
@@ -2,93 +2,6 @@
22

33
build_all=false
44
chunks_count=0
5-
last_check_files=""
6-
last_check_result=""
7-
gh_output=""
8-
9-
# Define the file patterns
10-
core_files=(
11-
'\.github/.*'
12-
'cores/.*'
13-
'package/.*'
14-
'tools/.*'
15-
'platform\.txt'
16-
'programmers\.txt'
17-
'variants/esp32/.*'
18-
'variants/esp32c3/.*'
19-
'variants/esp32c6/.*'
20-
'variants/esp32h2/.*'
21-
'variants/esp32p4/.*'
22-
'variants/esp32s2/.*'
23-
'variants/esp32s3/.*'
24-
)
25-
library_files=(
26-
'libraries/.*/examples/.*'
27-
'libraries/.*/src/.*'
28-
)
29-
networking_files=(
30-
'libraries/Network/src/.*'
31-
)
32-
fs_files=(
33-
'libraries/FS/src/.*'
34-
)
35-
static_sketches_files=(
36-
'libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure\.ino'
37-
'libraries/BLE/examples/Server/Server\.ino'
38-
'libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer\.ino'
39-
'libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics\.ino'
40-
'libraries/NetworkClientSecure/src/.*'
41-
'libraries/BLE/src/.*'
42-
'libraries/Insights/src/.*'
43-
)
44-
idf_files=(
45-
'idf_component\.yml'
46-
'Kconfig\.projbuild'
47-
'CMakeLists\.txt'
48-
'variants/esp32c2/.*'
49-
)
50-
51-
# Function to check if any files match the patterns
52-
check_files() {
53-
local patterns=("$@")
54-
local files_found=""
55-
for pattern in "${patterns[@]}"; do
56-
echo "Checking pattern: $pattern"
57-
matched_files=$(echo "$gh_output" | grep -E "$pattern")
58-
echo "matched_files: $matched_files"
59-
files_found+="$matched_files "
60-
done
61-
62-
last_check_files=$(echo "$files_found" | xargs)
63-
if [[ -n $last_check_files ]]; then
64-
last_check_result="true"
65-
else
66-
last_check_result="false"
67-
fi
68-
echo "last_check_result: $last_check_result"
69-
}
70-
71-
if [[ $IS_PR != 'true' ]]; then
72-
gh_output=$(gh api repos/espressif/arduino-esp32/commits/"$GITHUB_SHA" --jq '.files[].filename')
73-
else
74-
gh_output=$(gh pr diff "$PR_NUM" --name-only)
75-
fi
76-
echo "gh_output: $gh_output"
77-
78-
# Output the results
79-
check_files "${core_files[@]}"
80-
CORE_CHANGED=$last_check_result
81-
check_files "${library_files[@]}"
82-
LIB_CHANGED=$last_check_result
83-
LIB_FILES=$last_check_files
84-
check_files "${networking_files[@]}"
85-
NETWORKING_CHANGED=$last_check_result
86-
check_files "${fs_files[@]}"
87-
FS_CHANGED=$last_check_result
88-
check_files "${static_sketches_files[@]}"
89-
STATIC_SKETCHES_CHANGED=$last_check_result
90-
check_files "${idf_files[@]}"
91-
IDF_CHANGED=$last_check_result
925

936
if [[ $CORE_CHANGED == 'true' ]] || [[ $IS_PR != 'true' ]]; then
947
echo "Core files changed or not a PR. Building all."
@@ -163,9 +76,9 @@ chunks+="]"
16376

16477
{
16578
echo "build_all=$build_all"
166-
echo "build_libraries=$LIB_CHANGED"
167-
echo "build_static_sketches=$STATIC_SKETCHES_CHANGED"
168-
echo "build_idf=$IDF_CHANGED"
79+
echo "build_libraries=$BUILD_LIBRARIES"
80+
echo "build_static_sketches=$BUILD_STATIC_SKETCHES"
81+
echo "build_idf=$BUILD_IDF"
16982
echo "chunk_count=$chunks_count"
17083
echo "chunks=$chunks"
17184
} >> "$GITHUB_OUTPUT"

‎.github/workflows/build_py_tools.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030
echo "Make sure you are using a branch inside the repository and not a fork."
3131
3232
- name: Verify Python Tools Changed
33+
uses: tj-actions/changed-files@v41
3334
id: verify-changed-files
34-
run: |
35-
CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r ^HEAD -- tools/get.py tools/espota.py tools/gen_esp32part.py tools/gen_insights_package.py | xargs)
36-
echo "all_changed_files=$CHANGED_FILES" >> $GITHUB_OUTPUT
37-
if [ -n "$CHANGED_FILES" ]; then
38-
echo "any_changed=true" >> $GITHUB_OUTPUT
39-
else
40-
echo "any_changed=false" >> $GITHUB_OUTPUT
41-
fi
42-
35+
with:
36+
fetch_depth: "2"
37+
since_last_remote_commit: "true"
38+
files: |
39+
tools/get.py
40+
tools/espota.py
41+
tools/gen_esp32part.py
42+
tools/gen_insights_package.py
4343
- name: List all changed files
4444
shell: bash
4545
run: |

‎.github/workflows/pre-commit.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,7 @@ jobs:
5858

5959
- name: Get changed files
6060
id: changed-files
61-
env:
62-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63-
PR_NUM: ${{ github.event.pull_request.number }}
64-
IS_PR: ${{ github.event_name == 'pull_request' }}
65-
GITHUB_SHA: ${{ github.sha }}
66-
run: |
67-
if [[ $IS_PR != 'true' ]]; then
68-
files_changed=$(gh api repos/espressif/arduino-esp32/commits/"$GITHUB_SHA" --jq '.files[].filename' | xargs)
69-
else
70-
files_changed=$(gh pr diff "$PR_NUM" --name-only | xargs)
71-
fi
72-
echo "all_changed_files=$files_changed" >> $GITHUB_OUTPUT
73-
echo "Changed files:"
74-
for file in $files_changed; do
75-
echo " $file"
76-
done
61+
uses: tj-actions/changed-files@v42.0.2
7762

7863
- name: Run pre-commit hooks in changed files
7964
run: pre-commit run --color=always --show-diff-on-failure --files ${{ steps.changed-files.outputs.all_changed_files }}

‎.github/workflows/push.yml

+49-5
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ on:
4545
- "!.github/scripts/tests_*"
4646
- "!.github/scripts/upload_*"
4747
- "variants/esp32/**/*"
48+
- "variants/esp32s2/**/*"
49+
- "variants/esp32s3/**/*"
4850
- "variants/esp32c2/**/*"
4951
- "variants/esp32c3/**/*"
5052
- "variants/esp32c6/**/*"
5153
- "variants/esp32h2/**/*"
52-
- "variants/esp32p4/**/*"
53-
- "variants/esp32s2/**/*"
54-
- "variants/esp32s3/**/*"
5554

5655
concurrency:
5756
group: build-${{github.event.pull_request.number || github.ref}}
@@ -86,13 +85,58 @@ jobs:
8685
with:
8786
fetch-depth: 2
8887

88+
- name: Get changed files
89+
id: changed-files
90+
uses: tj-actions/changed-files@v44
91+
with:
92+
files_yaml: |
93+
core:
94+
- '.github/**'
95+
- 'cores/**'
96+
- 'package/**'
97+
- 'tools/**'
98+
- 'platform.txt'
99+
- 'programmers.txt'
100+
- "variants/esp32/**/*"
101+
- "variants/esp32s2/**/*"
102+
- "variants/esp32s3/**/*"
103+
- "variants/esp32c3/**/*"
104+
- "variants/esp32c6/**/*"
105+
- "variants/esp32h2/**/*"
106+
libraries:
107+
- 'libraries/**/examples/**'
108+
- 'libraries/**/src/**'
109+
networking:
110+
- 'libraries/Network/src/**'
111+
fs:
112+
- 'libraries/FS/src/**'
113+
static_sketeches:
114+
- 'libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino'
115+
- 'libraries/BLE/examples/Server/Server.ino'
116+
- 'libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino'
117+
- 'libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino'
118+
- 'libraries/NetworkClientSecure/src/**'
119+
- 'libraries/BLE/src/**'
120+
- 'libraries/Insights/src/**'
121+
idf:
122+
- 'idf_component.yml'
123+
- 'Kconfig.projbuild'
124+
- 'CMakeLists.txt'
125+
- "variants/esp32c2/**/*"
126+
89127
- name: Set chunks
90128
id: set-chunks
91129
env:
130+
LIB_FILES: ${{ steps.changed-files.outputs.libraries_all_changed_files }}
92131
IS_PR: ${{ github.event_name == 'pull_request' }}
93-
PR_NUM: ${{ github.event.pull_request.number }}
94132
MAX_CHUNKS: ${{ env.MAX_CHUNKS }}
95-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133+
BUILD_IDF: ${{ steps.changed-files.outputs.idf_any_changed == 'true' }}
134+
BUILD_LIBRARIES: ${{ steps.changed-files.outputs.libraries_any_changed == 'true' }}
135+
BUILD_STATIC_SKETCHES: ${{ steps.changed-files.outputs.static_sketeches_any_changed == 'true' }}
136+
FS_CHANGED: ${{ steps.changed-files.outputs.fs_any_changed == 'true' }}
137+
NETWORKING_CHANGED: ${{ steps.changed-files.outputs.networking_any_changed == 'true' }}
138+
CORE_CHANGED: ${{ steps.changed-files.outputs.core_any_changed == 'true' }}
139+
LIB_CHANGED: ${{ steps.changed-files.outputs.libraries_any_changed == 'true' }}
96140
run: |
97141
bash ./.github/scripts/set_push_chunks.sh
98142

0 commit comments

Comments
 (0)