Skip to content

Commit 898e548

Browse files
authored
Merge branch 'master' into docs_migration_deploy
2 parents 85c8163 + 563ccce commit 898e548

32 files changed

+809
-665
lines changed

.github/workflows/docs_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ jobs:
4242
with:
4343
name: docs
4444
path: docs
45-

.github/workflows/docs_preview.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Documentation Build and Deploy CI
1+
name: Documentation Build and Preview Deploy CI
22

33
on:
44
push:
@@ -27,11 +27,17 @@ jobs:
2727
env:
2828
# Deploy to preview server
2929
# DOCS_BUILD_DIR: "./docs/_build"
30-
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
31-
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
30+
# DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
31+
# DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
32+
# DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
33+
# DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
34+
# DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
35+
// Production
36+
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
37+
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
3238
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
33-
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
34-
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
39+
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
40+
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
3541
run: |
3642
sudo apt update
3743
sudo apt install python3-pip python3-setuptools

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ set(CORE_SRCS
5151
cores/esp32/FunctionalInterrupt.cpp
5252
cores/esp32/HardwareSerial.cpp
5353
cores/esp32/IPAddress.cpp
54-
cores/esp32/IPv6Address.cpp
5554
cores/esp32/libb64/cdecode.c
5655
cores/esp32/libb64/cencode.c
5756
cores/esp32/main.cpp

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![Documentation Status](https://readthedocs.com/projects/espressif-arduino-esp32/badge/?version=latest)](https://docs.espressif.com/projects/arduino-esp32/en/latest/?badge=latest)
4-
[![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml?link=http://https://github.com/espressif/arduino-esp32/blob/master/LIBRARIES_TEST.md)
3+
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml?link=http://https://github.com/espressif/arduino-esp32/blob/master/LIBRARIES_TEST.md)
54

65
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
76

0 commit comments

Comments
 (0)