diff --git a/.github/workflows/ci-esp32.yml b/.github/workflows/ci-esp32.yml index 4796499abc..f849ea2033 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: @@ -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 @@ -48,7 +53,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 +64,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..f565d8a942 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 @@ -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 @@ -46,7 +51,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 +62,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..55c26fd07c 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 @@ -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 }} @@ -71,23 +76,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 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 diff --git a/Tools/install.sh b/Tools/install.sh index 939aa68942..555edbc7e2 100755 --- a/Tools/install.sh +++ b/Tools/install.sh @@ -96,18 +96,18 @@ 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 \ - g++-9-multilib \ + g++-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 - else MACHINE_PACKAGES=""