diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-06-26 20:00:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-26 20:00:00 +0200 |
commit | 441f6abac2d8967cc993b6d9d947975f707ff505 (patch) | |
tree | 1a20561ace4b83680030444e12009e1c660084cf | |
parent | 2ec946a16b88456961b971c48cf43ff5b6eb3f86 (diff) | |
parent | 6027bfe9ad1cb07a4df46af0bfefcb60a230fbb1 (diff) | |
download | ATCD-441f6abac2d8967cc993b6d9d947975f707ff505.tar.gz |
Merge pull request #928 from jwillemsen/jwi-azurebadge
Use correct azure devops badge
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp | 6 | ||||
-rw-r--r-- | azure-pipelines.yml | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/README.md b/README.md index 5c78e9a7cd2..9294e7cc8fb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9a20abe6590a4b3ca946d7634d9f51af)](https://www.codacy.com/app/DOCGroup/ACE_TAO?utm_source=github.com&utm_medium=referral&utm_content=DOCGroup/ACE_TAO&utm_campaign=badger) [![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO) [![Coverity Scan Build Status](https://scan.coverity.com/projects/1/badge.svg)](https://scan.coverity.com/projects/1) -[![Azure DevOps](https://dev.azure.com/docgroup/ACE_TAO/_apis/build/status/DOCGroup.ACE_TAO)](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=1) +[![Azure DevOps](https://dev.azure.com/docgroup/ACE_TAO/_apis/build/status/DOCGroup.ACE_TAO?branchName=master)](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=7&branchName=master) # ACE/TAO # diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index d691b4e8495..51667657123 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -262,7 +262,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ping_interval_ = - ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("-n")) == 0) @@ -277,7 +277,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ping_timeout_ = - ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("--ftendpoint")) == 0) @@ -306,7 +306,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ft_update_delay_ = - ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); } else { diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9d6b0951d27..ddca4e85fa4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,6 +4,14 @@ variables: MPC_ROOT: $(Build.SourcesDirectory)/ACE/MPC system.prefergit: true +schedules: +- cron: "0 7 * * SUN" + displayName: Weekly Sunday + branches: + include: + - master + always: true + resources: - repo: self fetchDepth: 1 @@ -182,11 +190,12 @@ jobs: SSL_ROOT: $(Build.SourcesDirectory)\vcpkg\packages\openssl-windows_$(vcpkgarch) SSL_LIBDIR: $(SSL_ROOT)\$(vcpkglibdir) XERCESC_LIBDIR: $(XERCESCROOT)\$(vcpkglibdir) + VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg steps: - powershell: | - git clone --depth 1 git://github.com/Microsoft/vcpkg.git $(Build.SourcesDirectory)\vcpkg - .\vcpkg\bootstrap-vcpkg.bat - .\vcpkg\vcpkg.exe install --recurse --triplet $(vcpkgarch) openssl xerces-c + git clone --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT) + $(VCPKG_ROOT)\bootstrap-vcpkg.bat + $(VCPKG_ROOT)\vcpkg.exe install --recurse --triplet $(vcpkgarch) openssl xerces-c displayName: vcpkg - powershell: | '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h |