Skip to content

Commit 3af5a54

Browse files
authored
Merge branch 'espressif:master' into master
2 parents b3a41a3 + 794de50 commit 3af5a54

File tree

363 files changed

+4662
-1420
lines changed

Some content is hidden

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

363 files changed

+4662
-1420
lines changed

Diff for: .github/scripts/check-cmakelists.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# This script is for Travis. It checks all non-examples source files in libraries/ and cores/ are listed in
3+
# This script is used in the CI workflow. It checks all non-examples source files in libraries/ and cores/ are listed in
44
# CMakeLists.txt for the cmake-based IDF component
55
#
66
# If you see an error running this script, edit CMakeLists.txt and add any new source files into your PR

Diff for: .github/scripts/on-pages.sh

100644100755
File mode changed.

Diff for: .github/scripts/on-push.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,7 @@
22

33
set -e
44

5-
if [ ! -z "$TRAVIS_TAG" ]; then
6-
echo "Skipping Test: Tagged build"
7-
exit 0
8-
fi
9-
10-
if [ ! -z "$GITHUB_WORKSPACE" ]; then
11-
export TRAVIS_BUILD_DIR="$GITHUB_WORKSPACE"
12-
export TRAVIS_REPO_SLUG="$GITHUB_REPOSITORY"
13-
elif [ ! -z "$TRAVIS_BUILD_DIR" ]; then
14-
export GITHUB_WORKSPACE="$TRAVIS_BUILD_DIR"
15-
export GITHUB_REPOSITORY="$TRAVIS_REPO_SLUG"
16-
else
5+
if [ -z "$GITHUB_WORKSPACE" ]; then
176
export GITHUB_WORKSPACE="$PWD"
187
export GITHUB_REPOSITORY="espressif/arduino-esp32"
198
fi

Diff for: .github/workflows/gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Build GitHub Pages
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v1
19+
- uses: actions/checkout@v2
2020
- name: Copy Files
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/push.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
chunk: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
1919

2020
steps:
21-
- uses: actions/checkout@v1
22-
- uses: actions/setup-python@v1
21+
- uses: actions/checkout@v2
22+
- uses: actions/setup-python@v2
2323
with:
2424
python-version: '3.x'
2525
- name: Build Sketches
@@ -34,8 +34,8 @@ jobs:
3434
os: [windows-latest, macOS-latest]
3535

3636
steps:
37-
- uses: actions/checkout@v1
38-
- uses: actions/setup-python@v1
37+
- uses: actions/checkout@v2
38+
- uses: actions/setup-python@v2
3939
with:
4040
python-version: '3.x'
4141
- name: Build Sketches
@@ -50,8 +50,8 @@ jobs:
5050
os: [ubuntu-latest, windows-latest, macOS-latest]
5151

5252
steps:
53-
- uses: actions/checkout@v1
54-
- uses: actions/setup-python@v1
53+
- uses: actions/checkout@v2
54+
- uses: actions/setup-python@v2
5555
with:
5656
python-version: '3.x'
5757
- name: Build Sketches

Diff for: .github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@master
13+
- uses: actions/checkout@v2
1414
with:
1515
fetch-depth: 0
16-
- uses: actions/setup-python@v1
16+
- uses: actions/setup-python@v2
1717
with:
1818
python-version: '3.x'
1919
- name: Build Release

Diff for: .github/workflows/test_selfhosted_runner.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
build:
1111
name: Dummy test - self hosted GHR
1212
runs-on: self-hosted
13+
if: github.repository == 'espressif/arduino-esp32'
1314
steps:
1415
- name: Check out repo
1516
uses: actions/checkout@v2

Diff for: .travis.yml

-55
This file was deleted.

0 commit comments

Comments
 (0)