From 3446d580ecda5e45dc67bdb03d2a28d6c15702e0 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Fri, 15 Mar 2024 10:50:26 +0000 Subject: [PATCH 1/7] USB library broken with ESP32 IDF 5.2 Remove from supported SOC list for this version until fix implemented --- Sming/Libraries/USB | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sming/Libraries/USB b/Sming/Libraries/USB index ae08687c90..8df168d42a 160000 --- a/Sming/Libraries/USB +++ b/Sming/Libraries/USB @@ -1 +1 @@ -Subproject commit ae08687c900582a94db86d4cff1c492317e52307 +Subproject commit 8df168d42ad4e595398541255e4a0b791f04fda9 From 4eedc69273eb559434ee6e2462cc9e78a5e9c1d3 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Sat, 6 Jan 2024 09:26:34 +0000 Subject: [PATCH 2/7] Use ubuntu-latest for CI --- .github/workflows/ci-esp32.yml | 6 +++--- .github/workflows/ci.yml | 8 ++++---- .github/workflows/library.yml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-esp32.yml b/.github/workflows/ci-esp32.yml index 4796499abc..b6bf17d4c6 100644 --- a/.github/workflows/ci-esp32.yml +++ b/.github/workflows/ci-esp32.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-latest] + os: [ubuntu-latest, windows-latest] variant: [esp32, esp32s2, esp32c3, esp32s3, esp32c2] idf_version: ["4.3", "4.4", "5.0", "5.2"] exclude: @@ -48,7 +48,7 @@ jobs: "SMING_HOME=" + (Resolve-Path "Sming").path >> $env:GITHUB_ENV - name: Install build tools for Ubuntu - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | Tools/ci/install.sh @@ -59,7 +59,7 @@ jobs: Tools/ci/install.cmd - name: Build and test for ${{matrix.variant}} with IDF v${{matrix.idf_version}} on Ubuntu - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | source $SMING_HOME/../Tools/export.sh Tools/ci/build.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7173fb515d..cc68c5d784 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-latest] + os: [ubuntu-latest, windows-latest] variant: [esp8266, host, rp2040] include: - variant: esp8266 @@ -46,7 +46,7 @@ jobs: "SMING_HOME=" + (Resolve-Path "Sming").path >> $env:GITHUB_ENV - name: Install build tools for Ubuntu - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | Tools/ci/install.sh @@ -57,9 +57,9 @@ jobs: Tools/ci/install.cmd - name: Build and test for ${{matrix.variant}} on Ubuntu - env: + env: CLANG_FORMAT: clang-format-8 - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | source $SMING_HOME/../Tools/export.sh $CLANG_FORMAT --version diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index 531b04f0a6..84d572fb32 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-latest] + os: [ubuntu-latest, windows-latest] variant: [esp8266, host, esp32, esp32s2, esp32c3, rp2040] include: - variant: esp8266 @@ -71,23 +71,23 @@ jobs: "SMING_SOC=${{ matrix.variant }}" >> $env:GITHUB_ENV - name: Install build tools for Ubuntu - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | - . $SMING_HOME/../Tools/export.sh - $SMING_HOME/../Tools/ci/install.sh $SMING_ARCH + $SMING_HOME/../Tools/ci/install.sh - name: Install build tools for Windows if: ${{ matrix.os == 'windows-latest' }} run: | - . "$env:SMING_HOME/../Tools/ci/setenv.ps1" - . "$env:SMING_HOME/../Tools/ci/install.cmd" + cd $env:SMING_HOME/.. + . Tools/ci/setenv.ps1 + Tools/ci/install.cmd - name: Build and Test for ${{matrix.arch}} on Ubuntu env: CLANG_FORMAT: clang-format-8 - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-latest' }} run: | - . $SMING_HOME/../Tools/export.sh + source $SMING_HOME/../Tools/export.sh make -j$(nproc) -f $CI_MAKEFILE - name: Build and Test for ${{matrix.arch}} on Windows From ab606d72dbafa8a72dd02a08a0593fa80cba2c13 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Sat, 6 Jan 2024 12:29:29 +0000 Subject: [PATCH 3/7] Fix exfat support exfat-utils has moved to exfatprogs kernel contains exfat support, but requires linux-modules-extra-azure --- Tools/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/install.sh b/Tools/install.sh index 939aa68942..dff9925955 100755 --- a/Tools/install.sh +++ b/Tools/install.sh @@ -102,8 +102,8 @@ if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then g++-9-multilib \ python3-setuptools \ ninja-build \ - exfat-fuse \ - exfat-utils \ + linux-modules-extra-azure \ + exfatprogs \ $EXTRA_PACKAGES sudo update-alternatives --set gcc /usr/bin/gcc-9 From 1438deda22096ad430500a85ef58dda432d5ff83 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Tue, 9 Jan 2024 20:14:33 +0000 Subject: [PATCH 4/7] Add repo for clang --- Tools/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/install.sh b/Tools/install.sh index dff9925955..945fa2766c 100755 --- a/Tools/install.sh +++ b/Tools/install.sh @@ -96,6 +96,8 @@ fi if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then + # Provide repo. for clang-format-8 on Ubuntu 22.04 + sudo apt-add-repository -y 'deb http://mirrors.kernel.org/ubuntu focal main universe' sudo apt-get -y update $PKG_INSTALL \ clang-format-8 \ From 1d136bf9d80027e719bb2a5d59b7fa8a01ba65c7 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Tue, 9 Jan 2024 20:29:02 +0000 Subject: [PATCH 5/7] Use default gcc (11) --- Tools/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Tools/install.sh b/Tools/install.sh index 945fa2766c..555edbc7e2 100755 --- a/Tools/install.sh +++ b/Tools/install.sh @@ -101,15 +101,13 @@ if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then sudo apt-get -y update $PKG_INSTALL \ clang-format-8 \ - g++-9-multilib \ + g++-multilib \ python3-setuptools \ ninja-build \ linux-modules-extra-azure \ exfatprogs \ $EXTRA_PACKAGES - sudo update-alternatives --set gcc /usr/bin/gcc-9 - else MACHINE_PACKAGES="" From 71e353335b19b632e99d46547bbd893c9ad572c9 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Fri, 15 Mar 2024 15:16:59 +0000 Subject: [PATCH 6/7] Fix FatIFS test failure Recent versions of fsck.vfat require volume label matches boot sector --- Sming/Components/IFS | 2 +- Sming/Libraries/FatIFS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sming/Components/IFS b/Sming/Components/IFS index 36637f4e20..ec9a902121 160000 --- a/Sming/Components/IFS +++ b/Sming/Components/IFS @@ -1 +1 @@ -Subproject commit 36637f4e207e14d2484b9b827c573f1ba54392cd +Subproject commit ec9a902121afaebd882b7627907e8fffa78c7b5a diff --git a/Sming/Libraries/FatIFS b/Sming/Libraries/FatIFS index b4c11f4f28..33474a7d56 160000 --- a/Sming/Libraries/FatIFS +++ b/Sming/Libraries/FatIFS @@ -1 +1 @@ -Subproject commit b4c11f4f28deb99fe48c25a16f0f72915202c05d +Subproject commit 33474a7d560b6b27bbb0b1effa4b06c96361ff88 From 355290354ba5427b5444efe4a04028c3e89519eb Mon Sep 17 00:00:00 2001 From: mikee47 Date: Thu, 14 Mar 2024 20:19:03 +0000 Subject: [PATCH 7/7] Explicitly use python 3.12 for CI Stick with default (3.8) for ESP32 IDF 4.3, doesn't work with anything later --- .github/workflows/ci-esp32.yml | 7 ++++++- .github/workflows/ci.yml | 7 ++++++- .github/workflows/library.yml | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-esp32.yml b/.github/workflows/ci-esp32.yml index b6bf17d4c6..f849ea2033 100644 --- a/.github/workflows/ci-esp32.yml +++ b/.github/workflows/ci-esp32.yml @@ -39,7 +39,12 @@ jobs: git config --global --add core.autocrlf input - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.idf_version == '4.3' && '3.8' || '3.12' }} - name: Configure environment shell: pwsh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc68c5d784..f565d8a942 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,12 @@ jobs: git config --global --add core.autocrlf input - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Configure environment shell: pwsh diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index 84d572fb32..55c26fd07c 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -49,7 +49,12 @@ jobs: git config --global --add core.autocrlf input - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Create library alias if: ${{ inputs.alias }}