Skip to content

Commit 3307e49

Browse files
committed
[2.0.0] Update release builder and package json (#4826)
1 parent e46b6b6 commit 3307e49

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

.github/scripts/on-release.sh

+14-13
Original file line numberDiff line numberDiff line change
@@ -171,19 +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/"
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/"
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/"
187187

188188
# Remove unnecessary files in the package folder
189189
echo "Cleaning up folders ..."
@@ -195,6 +195,7 @@ echo "Generating platform.txt..."
195195
cat "$GITHUB_WORKSPACE/platform.txt" | \
196196
sed "s/version=.*/version=$ver$extent/g" | \
197197
sed 's/runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf//g' | \
198+
sed 's/runtime.tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf//g' | \
198199
sed 's/tools.esptool_py.path={runtime.platform.path}\/tools\/esptool/tools.esptool_py.path=\{runtime.tools.esptool_py.path\}/g' \
199200
> "$PKG_DIR/platform.txt"
200201

package/package_esp32_index.template.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@
3636
{
3737
"packager": "esp32",
3838
"name": "xtensa-esp32-elf-gcc",
39-
"version": "gcc8_2_0-esp-2019r2"
39+
"version": "gcc8_4_0-esp-2020r3"
40+
},
41+
{
42+
"packager": "esp32",
43+
"name": "xtensa-esp32s2-elf-gcc",
44+
"version": "gcc8_4_0-esp-2020r3"
4045
},
4146
{
4247
"packager": "esp32",
@@ -47,6 +52,16 @@
4752
"packager": "esp32",
4853
"name": "mkspiffs",
4954
"version": "0.2.3"
55+
},
56+
{
57+
"packager": "esp32",
58+
"name": "mkfatfs",
59+
"version": "0.3.6"
60+
},
61+
{
62+
"packager": "esp32",
63+
"name": "mklittlefs",
64+
"version": "3.0.0-gnu12-dc7f933"
5065
}
5166
]
5267
}

0 commit comments

Comments
 (0)