Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into develop-add-littlefs
  • Loading branch information
josesimoes committed Jun 28, 2024
2 parents 1a79655 + 5f5feb1 commit c9c917c
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/All/Dockerfile.All.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip

# Clone ESP-IDF
RUN git clone --branch v5.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
RUN git clone --branch v5.1.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf

# Clone what is needed for TI
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/ESP32/Dockerfile.ESP32
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-esp32:v2.30
FROM ghcr.io/nanoframework/dev-container-esp32:v2.31
2 changes: 1 addition & 1 deletion .devcontainer/ESP32/Dockerfile.ESP32.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN mkdir -p /usr/local/bin/gcc
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs

# Clone ESP-IDF
RUN git clone --branch v5.1.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
RUN git clone --branch v5.1.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf

# Creating static link python for pyhton3
RUN ln -fs /usr/bin/python3 /usr/bin/python \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ steps:
- task: Cache@2
displayName: Cache ESP32 tools
inputs:
key: "esp32_tools | 5_1_3"
restoreKeys: 5_1_3
key: "esp32_tools | 5_1_4"
restoreKeys: 5_1_4
path: $(UserProfile)\.espressif\tools
cacheHitVar: ESP32_TOOLS_CACHE_RESTORED

Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ resources:
type: github
name: espressif/esp-idf
endpoint: nanoframework
ref: refs/tags/v5.1.3
ref: 'refs/tags/v5.1.4'
- repository: mscorlib
type: github
name: nanoframework/CoreLibrary
Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
variables:
DOTNET_NOLOGO: true
# creates a counter and assigns it to the revision variable
REVISION: $[counter('STM32_1_9_1_versioncounter', 0)]
REVISION: $[counter('STM32_1_10_0_versioncounter', 0)]
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
TargetPlatform: "stm32"

Expand Down Expand Up @@ -561,7 +561,7 @@ jobs:
variables:
DOTNET_NOLOGO: true
# creates a counter and assigns it to the revision variable
REVISION: $[counter('ESP32_1_9_1_versioncounter', 0)]
REVISION: $[counter('ESP32_1_10_0_versioncounter', 0)]
IDF_PATH: "D:/a/1/s/esp-idf"
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
TargetPlatform: "esp32"
Expand Down Expand Up @@ -642,7 +642,7 @@ jobs:
variables:
DOTNET_NOLOGO: true
# creates a counter and assigns it to the revision variable
REVISION: $[counter('NXP_1_9_1_versioncounter', 0)]
REVISION: $[counter('NXP_1_10_0_versioncounter', 0)]
GIT_LFS_SKIP_SMUDGE: 1
TargetPlatform: "freertos"

Expand Down Expand Up @@ -720,7 +720,7 @@ jobs:
variables:
DOTNET_NOLOGO: true
# creates a counter and assigns it to the revision variable
REVISION: $[counter('TI_1_9_1_versioncounter', 0)]
REVISION: $[counter('TI_1_10_0_versioncounter', 0)]
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
TargetPlatform: "ti_simplelink"

Expand Down Expand Up @@ -791,7 +791,7 @@ jobs:

variables:
# creates a counter and assigns it to the revision variable
REVISION: $[counter('AZURERTOS_1_9_1_versioncounter', 0)]
REVISION: $[counter('AZURERTOS_1_10_0_versioncounter', 0)]
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
TargetPlatform: "azure_rtos"

Expand Down Expand Up @@ -842,7 +842,7 @@ jobs:
value: true
# creates a counter and assigns it to the revision variable
- name: REVISION
value: $[counter('WIN32_1_9_1_versioncounter', 0)]
value: $[counter('WIN32_1_10_0_versioncounter', 0)]
- name: LITTLEFS_PATH
value: "D:/a/1/s/littlefs"

Expand Down
2 changes: 1 addition & 1 deletion targets/ESP32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ endif()
# WHEN CHANGING THIS MAKE SURE TO UPDATE:
# 1. the dev containers
# 2. ref in AZDO pipeline yaml in Community Targets repo
set(ESP32_IDF_TAG "5.1.3" CACHE INTERNAL "ESP32 IDF tag")
set(ESP32_IDF_TAG "5.1.4" CACHE INTERNAL "ESP32 IDF tag")

if(NO_ESP32_IDF_PATH)
# no ESP32 IDF source specified, download it from official repo
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.9.1",
"version": "1.10.0",
"assemblyVersion": {
"precision": "revision"
},
Expand All @@ -25,4 +25,4 @@
"versionIncrement": "build",
"firstUnstableTag": "preview"
}
}
}

0 comments on commit c9c917c

Please sign in to comment.