Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/GSL.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com>2021-02-24 22:16:21 +0300
committerGitHub <noreply@github.com>2021-02-24 22:16:21 +0300
commit176c92e802456f1c52ccd99c0a34d5b1cc6ea020 (patch)
tree42a3ae2a4e317732618d3400f7f6c581f6762a29
parent84aeb59f269ee9747e85d780c8aa180bca3a9a60 (diff)
Branch rename cleanup (#976)
* Update pipeline build tag The build status was still looking for a "master" branch, updated it to point to "main" * Update ios.yml * Update android.yml * Update azure-pipelines.yml * Update CONTRIBUTING.md
-rw-r--r--.github/workflows/android.yml6
-rw-r--r--.github/workflows/ios.yml4
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md2
-rw-r--r--azure-pipelines.yml2
5 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6314def..836b444 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,9 +1,9 @@
name: CI_Android
on:
push:
- branches: [ master ]
+ branches: [ main ]
pull_request:
- branches: [ master ]
+ branches: [ main ]
jobs:
Android:
@@ -47,4 +47,4 @@ jobs:
adb shell find /data/local/tmp/tests -maxdepth 1 -exec chmod +x {} \\\;
- name: Test
- run: adb shell find /data/local/tmp/tests -name "*_tests" -maxdepth 1 -exec {} \\\; \ No newline at end of file
+ run: adb shell find /data/local/tmp/tests -name "*_tests" -maxdepth 1 -exec {} \\\;
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 528c6fa..9d29bbc 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -1,9 +1,9 @@
name: CI_iOS
on:
push:
- branches: [ master ]
+ branches: [ main ]
pull_request:
- branches: [ master ]
+ branches: [ main ]
jobs:
iOS:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 990b8e1..e28f534 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Please submit a Contributor License Agreement (CLA) before submitting a pull req
Your pull request should:
* Include a description of what your change intends to do
-* Be a child commit of a reasonably recent commit in the **master** branch
+* Be a child commit of a reasonably recent commit in the **main** branch
* Requests need not be a single commit, but should be a linear sequence of commits (i.e. no merge commits in your PR)
* It is desirable, but not necessary, for the tests to pass at each commit. Please see [README.md](./README.md) for instructions to build the test suite.
* Have clear commit messages
diff --git a/README.md b/README.md
index 989a50b..e396057 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# GSL: Guidelines Support Library
-[![Build Status](https://dev.azure.com/cppstat/GSL/_apis/build/status/microsoft.GSL?branchName=master)](https://dev.azure.com/cppstat/GSL/_build/latest?definitionId=1&branchName=master)
+[![Build Status](https://dev.azure.com/cppstat/GSL/_apis/build/status/microsoft.GSL?branchName=main)](https://dev.azure.com/cppstat/GSL/_build/latest?definitionId=1&branchName=main)
The Guidelines Support Library (GSL) contains functions and types that are suggested for use by the
[C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines) maintained by the [Standard C++ Foundation](https://isocpp.org).
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 47c29c1..0d1219a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,5 @@
trigger:
- - master
+ - main
pr:
autoCancel: true