Skip to content

Commit 75d684c

Browse files
Prepare move to esp32 as submodule
1 parent 74d234e commit 75d684c

File tree

10,142 files changed

+7
-2543143
lines changed

Some content is hidden

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

10,142 files changed

+7
-2543143
lines changed

.github/scripts/on-release.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ if [ -z "$GITHUB_WORKSPACE" ]; then
66
export GITHUB_EVENT_PATH="$GITHUB_WORKSPACE/.github/test-release-published-event.json"
77
fi
88

9-
export BASE_DIR="$GITHUB_WORKSPACE/arduino-esp32"
10-
export UPSTREAM_DIR="$GITHUB_WORKSPACE/arduino-esp32-fork"
9+
export UPSTREAM_DIR="$GITHUB_WORKSPACE/arduino-esp32"
10+
export BASE_DIR="$UPSTREAM_DIR"
1111
export MODS_DIR="$GITHUB_WORKSPACE/arduino-esp32-fork-mods"
1212

13-
# Clone updstream code
14-
echo "Start Cloning espressif/arduino-esp32"
15-
rsync -av "$UPSTREAM_DIR/" "$BASE_DIR/"
16-
echo "Done Cloning espressif/arduino-esp32"
13+
# Clone espressif/arduino-esp32 repo tag 2.0.14 as submodule
14+
echo "Updating submodules ..."
15+
git -C "$BASE_DIR" submodule update --init --recursive > /dev/null 2>&1
16+
17+
1718

1819
# Overwrite the files in BASE_DIR with files MODS_DIR
1920
echo "Start Copying Fri3d arduino-esp32 mods"
@@ -143,9 +144,6 @@ mkdir -p "$OUTPUT_DIR"
143144
PKG_DIR="$OUTPUT_DIR/$PACKAGE_NAME"
144145
PACKAGE_ZIP="$PACKAGE_NAME.zip"
145146

146-
echo "Updating submodules ..."
147-
git -C "$BASE_DIR" submodule update --init --recursive > /dev/null 2>&1
148-
149147
mkdir -p "$PKG_DIR/tools"
150148

151149
# Copy all core files to the package folder

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
/arduino-esp32/

arduino-esp32-fork/.gitignore

Lines changed: 0 additions & 45 deletions
This file was deleted.

arduino-esp32-fork/.gitmodules

Whitespace-only changes.

arduino-esp32-fork/.readthedocs.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

arduino-esp32-fork/.readthedocs.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

arduino-esp32-fork/CMakeLists.txt

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)