From 46babafde9ddd5975595841a70876d5759adc4ca Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 17:54:37 +0400 Subject: [PATCH 1/6] Fix paths for osx. --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e4dc6e..434a7e3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,16 +34,16 @@ jobs: git config --local advice.detachedHead false git checkout FETCH_HEAD git submodule update --init --depth 1 - workingDirectory: $(Agent.BuildDirectory)\Source + workingDirectory: $(Agent.BuildDirectory)/Source failOnStderr: false - task: CmdLine@2 displayName: "Apply patches" inputs: script: | - git apply $(Build.SourcesDirectory)\Patches\Patch001.patch - git apply $(Build.SourcesDirectory)\Patches\Patch002.patch - workingDirectory: $(Agent.BuildDirectory)\Source + git apply $(Build.SourcesDirectory)/Patches/Patch001.patch + git apply $(Build.SourcesDirectory)/Patches/Patch002.patch + workingDirectory: $(Agent.BuildDirectory)/Source failOnStderr: true - task: CmdLine@2 From 747fce8b85e9f15a563e3e5391576448c17d5207 Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 18:05:47 +0400 Subject: [PATCH 2/6] Remove openssl linking. --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 434a7e3..f64f5b9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,9 +50,9 @@ jobs: displayName: "Brew install dependencies" inputs: script: | - brew install openssl@1.1 - brew link --force openssl@1.1 - brew install protobuf@21 + brew update + brew list openssl@1.1 || brew install openssl@1.1 + brew list protobuf@21 || brew install protobuf@21 brew link --force protobuf@21 workingDirectory: $(Agent.BuildDirectory) failOnStderr: true From 846b08466cd18c7f2df3d3dd6a980446788375a4 Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 18:14:24 +0400 Subject: [PATCH 3/6] Turn off fail on std error for brew update. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f64f5b9..6499a55 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,7 +55,7 @@ jobs: brew list protobuf@21 || brew install protobuf@21 brew link --force protobuf@21 workingDirectory: $(Agent.BuildDirectory) - failOnStderr: true + failOnStderr: false - task: CmdLine@2 displayName: "CMake generate solution" From ac0b8b547a642c9e03ca9f2442877574768c3787 Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 18:20:11 +0400 Subject: [PATCH 4/6] Add openssl linking. --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6499a55..3551028 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,8 @@ jobs: inputs: script: | brew update - brew list openssl@1.1 || brew install openssl@1.1 + brew reinstall openssl@1.1 + brew link --force openssl@1.1 brew list protobuf@21 || brew install protobuf@21 brew link --force protobuf@21 workingDirectory: $(Agent.BuildDirectory) From d07748f9584104d6528ab4e666bc2387ce054390 Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 18:56:52 +0400 Subject: [PATCH 5/6] Set target arch to x86 only. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3551028..7520bca 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,7 +62,7 @@ jobs: displayName: "CMake generate solution" inputs: script: | - cmake -G "$(CMAKE_GENERATOR)" -T buildsystem=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -B Build -S Source + cmake -G "$(CMAKE_GENERATOR)" -T buildsystem=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_OSX_ARCHITECTURES="x86_64" -B Build -S Source workingDirectory: $(Agent.BuildDirectory) failOnStderr: true From 4eafaeb7c54d1619fcd3ae760772247abf37e114 Mon Sep 17 00:00:00 2001 From: Alex Malyutin Date: Sat, 22 Jul 2023 19:09:11 +0400 Subject: [PATCH 6/6] Fix build task. --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7520bca..331632d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,4 +70,6 @@ jobs: inputs: actions: build configuration: Release - xcWorkspacePath: \ No newline at end of file + xcWorkspacePath: "$(Agent.BuildDirectory)/Build/GameNetworkingSockets.xcodeproj/project.xcworkspace" + scheme: "ALL_BUILD" + SDK: "macosx13.1"