From 48a2f3592ce9dd7b50acef465a5664ff22890839 Mon Sep 17 00:00:00 2001 From: Jonathan <jonathanm@nippur.us> Date: Fri, 1 Jul 2022 15:54:46 -0300 Subject: [PATCH] change master to main in code --- .github/workflows/test_docs.yml | 4 ++-- AirLib/include/common/AirSimSettings.hpp | 2 +- Examples/DataCollection/DataCollectorSGM_settings.json | 2 +- Examples/DepthNav/DepthNav_settings.json | 2 +- PythonClient/computer_vision/cv_capture.py | 2 +- PythonClient/computer_vision/cv_mode.py | 2 +- PythonClient/computer_vision/cv_navigate.py | 2 +- PythonClient/computer_vision/getpos.py | 2 +- PythonClient/computer_vision/ground_truth.py | 2 +- PythonClient/computer_vision/objects.py | 2 +- PythonClient/computer_vision/segmentation.py | 2 +- PythonClient/multirotor/multi_agent_drone.py | 2 +- PythonClient/multirotor/opencv_show.py | 2 +- PythonClient/multirotor/sensorframe_lidar_pointcloud.py | 2 +- PythonClient/multirotor/vehicleframe_lidar_pointcloud.py | 2 +- azure/app/settings.json | 2 +- azure/azure-env-creation/vm-arm-template.json | 2 +- build.cmd | 2 +- docker/settings.json | 2 +- .../airsim_tutorial_pkgs/scripts/multi_drone_json_creator.py | 2 +- ros/src/airsim_tutorial_pkgs/settings/car.json | 2 +- .../settings/front_stereo_and_center_mono.json | 2 +- ros/src/airsim_tutorial_pkgs/settings/twenty_five_drones.json | 2 +- .../settings/two_drones_camera_lidar_imu.json | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml index 7e43a4d07..354315126 100644 --- 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 index 7977813ad..e5442ff22 100644 --- 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 index 47002ea8a..8f074a4b1 100644 --- 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 index 686f69734..f8f79d5bb 100644 --- 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 index 1ee625f82..2701ce300 100644 --- 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 index 66bca0c97..3c05e0870 100644 --- 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 index 2a9bd5c11..592190f1a 100644 --- 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 index 8304d429e..52783e744 100644 --- 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 index 5e04f1262..32c63796c 100644 --- 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 index 09f61831c..f5356c31c 100644 --- 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 index 520dfa027..8a6a550fb 100644 --- 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 index bfd044c3f..2338b1496 100644 --- 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 index e8efd1279..75a5e4862 100644 --- 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 index 12af0be38..10e11d41a 100644 --- 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 index 3aa92b950..e4f50bf7e 100644 --- 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 index 44b5a2000..ecd1e995a 100644 --- 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 index e87babba6..7e7ddea9c 100644 --- 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 index d75ca2b41..a3c1f37cf 100644 --- 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 index 8d6457324..25e4856dc 100644 --- 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 index 66ff98193..7a7dca6cb 100644 --- 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 index 5969b9dc9..c5efb8552 100644 --- 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 index 5672ffa35..435d95184 100644 --- 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 index 998f74a0f..e4f45882c 100644 --- 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 index 8c48ab125..7cb3fe1d9 100644 --- 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": {