change master to main in code

Kokika · Jul 1, 2022 · 48a2f35 · 48a2f35
1 parent 1cc4522
commit 48a2f35
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml
@@ -37,10 +37,10 @@ jobs:
       - name: Build AirSim Documentation
         run: ./build_docs.sh
 
-      # Only on commits to 'master' branch
+      # Only on commits to 'main' branch
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./build_docs

diff --git a/AirLib/include/common/AirSimSettings.hpp b/AirLib/include/common/AirSimSettings.hpp
@@ -471,7 +471,7 @@ namespace airlib
 
             Settings& settings_json = Settings::singleton();
             //write some settings_json in new file otherwise the string "null" is written if all settings_json are empty
-            settings_json.setString("SeeDocsAt", "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md");
+            settings_json.setString("SeeDocsAt", "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md");
             settings_json.setDouble("SettingsVersion", 1.2);
 
             std::string settings_filename = Settings::getUserDirectoryFullPath("settings.json");

diff --git a/Examples/DataCollection/DataCollectorSGM_settings.json b/Examples/DataCollection/DataCollectorSGM_settings.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
   "SettingsVersion": 1.2,
   "SimMode": "ComputerVision",
   "CameraDefaults": {

diff --git a/Examples/DepthNav/DepthNav_settings.json b/Examples/DepthNav/DepthNav_settings.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
   "SettingsVersion": 1.2,
   "SimMode": "ComputerVision",
   "CameraDefaults": {

diff --git a/PythonClient/computer_vision/cv_capture.py b/PythonClient/computer_vision/cv_capture.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path 
 import airsim

diff --git a/PythonClient/computer_vision/cv_mode.py b/PythonClient/computer_vision/cv_mode.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode:
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path
 import airsim

diff --git a/PythonClient/computer_vision/cv_navigate.py b/PythonClient/computer_vision/cv_navigate.py
@@ -1,6 +1,6 @@
 
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path 
 import airsim

diff --git a/PythonClient/computer_vision/getpos.py b/PythonClient/computer_vision/getpos.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path 
 import airsim

diff --git a/PythonClient/computer_vision/ground_truth.py b/PythonClient/computer_vision/ground_truth.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path 
 import airsim

diff --git a/PythonClient/computer_vision/objects.py b/PythonClient/computer_vision/objects.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path 
 import airsim

diff --git a/PythonClient/computer_vision/segmentation.py b/PythonClient/computer_vision/segmentation.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode: 
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import airsim
 import cv2

diff --git a/PythonClient/multirotor/multi_agent_drone.py b/PythonClient/multirotor/multi_agent_drone.py
@@ -9,7 +9,7 @@
 # Use below in settings.json with Blocks environment
 """
 {
-	"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+	"SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
 	"SettingsVersion": 1.2,
 	"SimMode": "Multirotor",
 	"ClockSpeed": 1,

diff --git a/PythonClient/multirotor/opencv_show.py b/PythonClient/multirotor/opencv_show.py
@@ -1,5 +1,5 @@
 # In settings.json first activate computer vision mode:
-# https://github.com/Microsoft/AirSim/blob/master/docs/image_apis.md#computer-vision-mode
+# https://github.com/Microsoft/AirSim/blob/main/docs/image_apis.md#computer-vision-mode
 
 import setup_path
 import airsim

diff --git a/PythonClient/multirotor/sensorframe_lidar_pointcloud.py b/PythonClient/multirotor/sensorframe_lidar_pointcloud.py
@@ -3,7 +3,7 @@
 # Sample settings.json used for this script:
 '''
 {
-    "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
+    "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
     "SettingsVersion": 1.2,
 
     "SimMode": "Multirotor",

diff --git a/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py b/PythonClient/multirotor/vehicleframe_lidar_pointcloud.py
@@ -3,7 +3,7 @@
 # Sample settings.json used for this script:
 '''
 {
-    "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
+    "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
     "SettingsVersion": 1.2,
 
     "SimMode": "Multirotor",

diff --git a/azure/app/settings.json b/azure/app/settings.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
   "SettingsVersion": 1.2,
   "SimMode": "Multirotor",
   "ClockSpeed": 1.0,

diff --git a/azure/azure-env-creation/vm-arm-template.json b/azure/azure-env-creation/vm-arm-template.json
@@ -39,7 +39,7 @@
             "metadata": {
                 "description": "Location of the setup script"
             },
-            "defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/master/azure/azure-env-creation"
+            "defaultValue": "https://raw.githubusercontent.com/microsoft/airsim/main/azure/azure-env-creation"
         },
         "ScriptFileName": {
             "type": "string",

diff --git a/build.cmd b/build.cmd
@@ -17,7 +17,7 @@ if "%VisualStudioVersion%" lss "17.0" (
     echo(
     echo Hello there! We just upgraded AirSim to Unreal Engine 4.27 and Visual Studio 2022.
     echo Here are few easy steps for upgrade so everything is new and shiny:
-    echo https://github.com/Microsoft/AirSim/blob/master/docs/unreal_upgrade.md
+    echo https://github.com/Microsoft/AirSim/blob/main/docs/unreal_upgrade.md
     goto :buildfailed_nomsg
 )
 

diff --git a/docker/settings.json b/docker/settings.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings_json.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings_json.md",
   "SettingsVersion": 1.2,
   "SimMode": "Multirotor",
   "ClockSpeed": 1.0,

diff --git a/ros/src/airsim_tutorial_pkgs/scripts/multi_drone_json_creator.py b/ros/src/airsim_tutorial_pkgs/scripts/multi_drone_json_creator.py
@@ -28,7 +28,7 @@ def __init__(self, sim_mode="Multirotor"):
         self.data = {}
 
     def add_minimal(self):
-        self.data["SeeDocsAt"] = "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md"
+        self.data["SeeDocsAt"] = "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md"
         self.data["SettingsVersion"] = 1.2
         self.data["SimMode"] = self.sim_mode #"Multirotor"
         self.data["ClockSpeed"] = 1

diff --git a/ros/src/airsim_tutorial_pkgs/settings/car.json b/ros/src/airsim_tutorial_pkgs/settings/car.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
   "SettingsVersion": 1.2,
   "SimMode": "Car",
   "ViewMode": "SpringArmChase",

diff --git a/ros/src/airsim_tutorial_pkgs/settings/front_stereo_and_center_mono.json b/ros/src/airsim_tutorial_pkgs/settings/front_stereo_and_center_mono.json
@@ -1,5 +1,5 @@
 {
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
   "SettingsVersion": 1.2,
   "SimMode": "Multirotor",
   "ViewMode": "SpringArmChase",

diff --git a/ros/src/airsim_tutorial_pkgs/settings/twenty_five_drones.json b/ros/src/airsim_tutorial_pkgs/settings/twenty_five_drones.json
@@ -1,6 +1,6 @@
 {
   "ClockSpeed": 1, 
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md", 
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md", 
   "SettingsVersion": 1.2, 
   "SimMode": "Multirotor", 
   "Vehicles": {

diff --git a/ros/src/airsim_tutorial_pkgs/settings/two_drones_camera_lidar_imu.json b/ros/src/airsim_tutorial_pkgs/settings/two_drones_camera_lidar_imu.json
@@ -1,6 +1,6 @@
 {
   "ClockSpeed": 1,
-  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/master/docs/settings.md",
+  "SeeDocsAt": "https://github.com/Microsoft/AirSim/blob/main/docs/settings.md",
   "SettingsVersion": 1.2,
   "SimMode": "Multirotor",
   "Vehicles": {