Skip to content

Commit 866996d

Browse files
committed
Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into develop
2 parents 712577e + 5504f4f commit 866996d

File tree

34 files changed

+1041
-573
lines changed

34 files changed

+1041
-573
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ We also have a [Community Targets](https://github.com/nanoframework/nf-Community
7272
|:---|---|---|
7373
| ESP32_S3 | Display & Quad spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
7474
| ESP32_S3_BLE | Display, BLE, Quad spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE/latest/) |
75+
| ESP32_S3_BLE_UART | Display, BLE, Quad spiram support, connection via UART| [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE_UART/latest/) |
7576
| ESP32_S3_ALL | Display, BLE, Octal spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL/latest/) |
77+
| ESP32_S3_ALL_UART | Display, BLE, Octal spiram support, connection via UART | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL_UART/latest/) |
7678

7779
### ESP32 risc-v boards
7880
| Target | Note | Version |

README.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
| ESP32_S3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
5050
| ESP32_S3_BLE | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE/latest/) |
5151
| ESP32_S3_ALL | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL/latest/) |
52+
| ESP32_S3_BLE_UART | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE_UART/latest/) |
53+
| ESP32_S3_ALL_UART | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL_UART/latest/) |
5254

5355
### M5Stack
5456

azure-pipelines-nightly.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,24 @@ jobs:
532532
PackageName: ESP32_S3_BLE
533533
CMakePreset: ESP32_S3_BLE
534534

535+
ESP32_S3_BLE_UART:
536+
TargetBoard: ESP32_S3
537+
TargetSeries: "esp32s3"
538+
BuildOptions:
539+
IDF_Target: esp32s3
540+
TargetName: ESP32_S3_BLE_UART
541+
PackageName: ESP32_S3_BLE_UART
542+
CMakePreset: ESP32_S3_BLE_UART
543+
544+
ESP32_S3_ALL_UART:
545+
TargetBoard: ESP32_S3
546+
TargetSeries: "esp32s3"
547+
BuildOptions:
548+
IDF_Target: esp32s3
549+
TargetName: ESP32_S3_ALL_UART
550+
PackageName: ESP32_S3_ALL_UART
551+
CMakePreset: ESP32_S3_ALL_UART
552+
535553
ESP32_WESP32:
536554
TargetSeries: "esp32"
537555
TargetBoard: ESP32

azure-pipelines-templates/copy-sdkconfig.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ parameters:
88

99
steps:
1010
- task: CopyFiles@2
11-
condition: succeeded()
11+
condition: >-
12+
or(
13+
succeeded(),
14+
failed()
15+
)
1216
displayName: Copying SDKCONFIG
1317
inputs:
1418
sourceFolder: "${{ parameters.repoDirectory }}"

azure-pipelines-templates/publish-sdkconfig.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33

44
steps:
55
- task: PublishPipelineArtifact@1
6-
condition: succeeded()
76
displayName: Publish SDKCONFIG artifact
7+
condition: >-
8+
or(
9+
succeeded(),
10+
failed()
11+
)
812
inputs:
913
targetPath: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)_sdkconfig'
1014
artifactName: $(TargetPublishName)_sdkconfig

azure-pipelines.yml

Lines changed: 6 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ jobs:
7070

7171
# get commit message
7272
- powershell: |
73+
git config --global user.email "nfbot"
74+
git config --global user.name "nanoframework@outlook.com"
75+
76+
$auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes(":$(GitHubToken)")))"
7377
7478
# set default values
7579
echo "##vso[task.setvariable variable=RUN_MSCORLIB_TESTS;isOutput=true]false"
@@ -92,7 +96,7 @@ jobs:
9296
# 'encoded token' is the Base64 of the string "nfbot:personal-token"
9397
$auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$(GitHubToken)")))"
9498
95-
$commit = Invoke-RestMethod -Uri "https://api.github.com/repos/nanoframework/nf-interpreter/commits/$(Build.SourceVersion)" -ContentType "application/json" -Method GET
99+
$commit = Invoke-RestMethod -Uri "https://api.github.com/repos/nanoframework/nf-interpreter/commits/$(Build.SourceVersion)" -Header @{"Authorization"="$auth"} -ContentType "application/json" -Method GET
96100
97101
if( ($commit.commit.author.name -eq "nfbot") -and ($commit.commit.message -like "*[version update]*") )
98102
{
@@ -1335,109 +1339,6 @@ jobs:
13351339
artifactName: VsTestCrashDumps
13361340
artifactType: pipeline
13371341

1338-
######################
1339-
# generate change log
1340-
- job: Generate_change_log
1341-
dependsOn:
1342-
- Build_STM32_targets
1343-
- Build_ESP32_targets
1344-
- Build_NXP_targets
1345-
- Build_TI_SimpleLink_targets
1346-
- Build_Azure_RTOS_targets
1347-
# skip build if this is a PR, submitted by nfbot and the commit message contains [version update]
1348-
condition: >-
1349-
and(
1350-
succeeded('Build_STM32_targets'),
1351-
succeeded('Build_ESP32_targets'),
1352-
succeeded('Build_NXP_targets'),
1353-
succeeded('Build_TI_SimpleLink_targets'),
1354-
succeeded('Build_Azure_RTOS_targets'),
1355-
not( eq(variables['Build.Reason'], 'PullRequest')
1356-
),
1357-
or(
1358-
eq(variables['Build.SourceBranchName'], 'main'),
1359-
startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ),
1360-
ne( variables['StartReleaseCandidate'], true )
1361-
)
1362-
1363-
pool:
1364-
vmImage: "windows-latest"
1365-
1366-
steps:
1367-
- task: DotNetCoreCLI@2
1368-
condition: succeeded()
1369-
displayName: Install NBGV tool
1370-
inputs:
1371-
command: custom
1372-
custom: tool
1373-
arguments: install --tool-path . nbgv
1374-
1375-
- script: nbgv cloud -a -c
1376-
condition: succeeded()
1377-
displayName: Set build number
1378-
1379-
- task: UseRubyVersion@0
1380-
condition: succeeded()
1381-
inputs:
1382-
versionSpec: "= 3.0"
1383-
addToPath: true
1384-
1385-
# Cache change log cache files
1386-
- task: Cache@2
1387-
displayName: Cache change log cache files
1388-
condition: >-
1389-
and(
1390-
succeeded(),
1391-
eq(variables['System.PullRequest.PullRequestId'], ''),
1392-
startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
1393-
)
1394-
inputs:
1395-
key: "changeLogCacheFiles"
1396-
restoreKeys: 1_0
1397-
path: |
1398-
$(Agent.TempDirectory)/github-changelog-logger.log
1399-
$(Agent.TempDirectory)/github-changelog-http-cache
1400-
1401-
# generate change log including future version
1402-
- powershell: |
1403-
gem install github_changelog_generator --quiet --no-document
1404-
# need to call it passing both cache options with full path otherwise it won't work
1405-
github_changelog_generator --token $(GitHubToken) --cache-log $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache --pr-wo-labels --future-release "v$env:NBGV_AssemblyVersion"
1406-
condition: >-
1407-
and(
1408-
succeeded(),
1409-
eq(variables['System.PullRequest.PullRequestId'], ''),
1410-
startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
1411-
)
1412-
displayName: Generate change log
1413-
1414-
# push new changelog to GitHub repo
1415-
- powershell: |
1416-
git config --global gc.auto 0
1417-
git config --global user.name nfbot
1418-
git config --global user.email nanoframework@outlook.com
1419-
git config --global core.autocrlf true
1420-
1421-
git add CHANGELOG.md
1422-
git commit -m "Update CHANGELOG" -m"***NO_CI***"
1423-
1424-
# compute authorization header in format "AUTHORIZATION: basic 'encoded token'"
1425-
# 'encoded token' is the Base64 of the string "nfbot:personal-token"
1426-
$auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$(GitHubToken)")))"
1427-
1428-
git -c http.extraheader="AUTHORIZATION: $auth" push origin "HEAD:$(Build.SourceBranchName)"
1429-
condition: >-
1430-
and(
1431-
succeeded(),
1432-
eq(variables['System.PullRequest.PullRequestId'], ''),
1433-
not(
1434-
startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
1435-
),
1436-
eq( variables['StartReleaseCandidate'], false )
1437-
)
1438-
continueOnError: true
1439-
displayName: Push changelog to GitHub
1440-
14411342
#################################
14421343
# report build failure to Discord
14431344
- job: Report_Build_Failure
@@ -1449,7 +1350,6 @@ jobs:
14491350
- Build_Azure_RTOS_targets
14501351
- Build_WIN32_nanoCLR
14511352
- Build_nanoCLR_CLI
1452-
- Generate_change_log
14531353
- Check_Code_Style
14541354
condition: >-
14551355
and(
@@ -1461,8 +1361,7 @@ jobs:
14611361
failed('Build_TI_SimpleLink_targets'),
14621362
failed('Build_Azure_RTOS_targets'),
14631363
failed('Build_WIN32_nanoCLR'),
1464-
failed('Build_nanoCLR_CLI'),
1465-
failed('Generate_change_log')
1364+
failed('Build_nanoCLR_CLI')
14661365
)
14671366
)
14681367

0 commit comments

Comments
 (0)