Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Commit 1baf85f

Browse files
authored
Merge pull request #1413 from microsoft/update-ci-branches
Update CI after branch renames
2 parents 130aa64 + 1456e85 commit 1baf85f

File tree

5 files changed

+18
-19
lines changed

5 files changed

+18
-19
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ name: CI
66
on:
77
push:
88
branches:
9-
- master
10-
- dev
9+
- main
10+
- release
1111
tags:
1212
- v*
1313
pull_request:
1414
branches:
15-
- master
16-
- dev
15+
- main
16+
- release
1717

1818
jobs:
1919
build:

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ There are many ways that you can contribute, beyond writing code. The goal of th
88

99
If you are interested in writing code to fix issues, first look at the issues with the [help-wanted](https://github.com/Microsoft/vscode-arduino/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) label. They should have the context and code pointers needed to get started. If not, then feel free to ask for some, and we will be happy to provide any guidance you need.
1010

11-
When you are doing code fix, please work against [dev](https://github.com/microsoft/vscode-arduino/tree/dev)
12-
branch and also submit pull request to `dev` branch.
13-
Changes will be merged into `master` branch after production release.
11+
When you are doing code fix, please work against [main](https://github.com/microsoft/vscode-arduino/tree/main)
12+
branch and also submit pull request to `main` branch.
13+
Changes will be merged into `release` branch after production release.
1414

1515

1616

README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Visual Studio Code extension for Arduino
22

33
[![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Microsoft/vscode-arduino)
4-
[![Travis CI](https://travis-ci.org/Microsoft/vscode-arduino.svg?branch=master)](https://travis-ci.org/Microsoft/vscode-arduino)
54

65
Welcome to the Visual Studio Code extension for **Arduino** <sup>preview</sup> ! The Arduino extension makes it easy to develop, build, deploy and debug your Arduino sketches in Visual Studio Code, with a rich set of functionalities. These include:
76

@@ -121,7 +120,7 @@ The following settings are as per sketch settings of the Arduino extension. You
121120
- `port` - Name of the serial port connected to the device. Can be set by the `Arduino: Select Serial Port` command. For Mac users could be "/dev/cu.wchusbserial1420".
122121
- `board` - Currently selected Arduino board alias. Can be set by the `Arduino: Change Board Type` command. Also, you can find the board list there.
123122
- `output` - Arduino build output path. If not set, Arduino will create a new temporary output folder each time, which means it cannot reuse the intermediate result of the previous build leading to long verify/upload time, so it is recommended to set the field. Arduino requires that the output path should not be the workspace itself or in a subfolder of the workspace, otherwise, it may not work correctly. By default, this option is not set. It's worth noting that the contents of this file could be deleted during the build process, so pick (or create) a directory that will not store files you want to keep.
124-
- `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/master/misc/debuggerUsbMapping.json). By default, this option is not set.
123+
- `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/release/misc/debuggerUsbMapping.json). By default, this option is not set.
125124
- `prebuild` - External command which will be invoked before any sketch build (verify, upload, ...). For details see the [Pre- and Post-Build Commands](#Pre--and-Post-Build-Commands) section.
126125
- `postbuild` - External command to be run after the sketch has been built successfully. See the afore mentioned section for more details.
127126
- `intelliSenseGen` - Override the global setting for auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
@@ -204,7 +203,7 @@ Steps to start debugging:
204203
> To learn more about how to debug Arduino code, visit our [team blog](https://blogs.msdn.microsoft.com/iotdev/2017/05/27/debug-your-arduino-code-with-visual-studio-code/).
205204
206205
## Change Log
207-
See the [Change log](https://github.com/Microsoft/vscode-arduino/blob/master/CHANGELOG.md) for details about the changes in each version.
206+
See the [Change log](https://github.com/Microsoft/vscode-arduino/blob/release/CHANGELOG.md) for details about the changes in each version.
208207

209208
## Supported Operating Systems
210209
Currently this extension supports the following operating systems:
@@ -242,7 +241,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
242241
The [Microsoft Enterprise and Developer Privacy Statement](https://www.microsoft.com/en-us/privacystatement/EnterpriseDev/default.aspx) describes the privacy statement of this software.
243242

244243
## License
245-
This extension is licensed under the [MIT License](https://github.com/Microsoft/vscode-arduino/blob/master/LICENSE.txt). Please see the [Third Party Notice](https://github.com/Microsoft/vscode-arduino/blob/master/ThirdPartyNotices.txt) file for additional copyright notices and terms.
244+
This extension is licensed under the [MIT License](https://github.com/Microsoft/vscode-arduino/blob/release/LICENSE.txt). Please see the [Third Party Notice](https://github.com/Microsoft/vscode-arduino/blob/release/ThirdPartyNotices.txt) file for additional copyright notices and terms.
246245

247246
## Contact Us
248247
If you would like to help build the best Arduino experience with VS Code, you can reach us directly at [gitter chat room](https://gitter.im/Microsoft/vscode-arduino).

azure-pipelines.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ parameters:
1414
- real
1515

1616
pr:
17-
- master
18-
- dev
17+
- main
18+
- release
1919

2020
trigger:
2121
branches:
2222
include:
23-
- master
24-
- dev
23+
- main
24+
- release
2525
tags:
2626
include:
2727
- v*
@@ -33,12 +33,12 @@ variables:
3333
# MicroBuild requires TeamName to be set.
3434
TeamName: C++ Cross Platform and Cloud
3535
# If the user didn't override the signing type, then only real-sign on tags,
36-
# master, or dev.
36+
# main, or release.
3737
${{ if ne(parameters.SignTypeOverride, 'default') }}:
3838
SignType: ${{ parameters.SignTypeOverride }}
39-
${{ if and(eq(parameters.SignTypeOverride, 'default'), or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), eq(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.SourceBranchName'], 'dev'))) }}:
39+
${{ if and(eq(parameters.SignTypeOverride, 'default'), or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), eq(variables['Build.SourceBranchName'], 'main'), eq(variables['Build.SourceBranchName'], 'release'))) }}:
4040
SignType: real
41-
${{ if and(eq(parameters.SignTypeOverride, 'default'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), eq(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.SourceBranchName'], 'dev')))) }}:
41+
${{ if and(eq(parameters.SignTypeOverride, 'default'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), eq(variables['Build.SourceBranchName'], 'main'), eq(variables['Build.SourceBranchName'], 'release')))) }}:
4242
SignType: test
4343

4444
steps:

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"bugs": {
1919
"url": "https://github.com/Microsoft/vscode-arduino/issues"
2020
},
21-
"homepage": "https://github.com/Microsoft/vscode-arduino/blob/master/README.md",
21+
"homepage": "https://github.com/Microsoft/vscode-arduino/blob/release/README.md",
2222
"categories": [
2323
"Programming Languages",
2424
"Debuggers",

0 commit comments

Comments
 (0)