Merge remote-tracking branch 'upstream/master'

Author: u3dreal

azure-pipelines.yml

@@ -150,34 +150,34 @@ jobs:
 #==============================================================================
 # MacOS binaries
 #==============================================================================
-- job: LuxCoreRenderMacOS
-  dependsOn: DetectBuildType
-  condition: succeeded()
-  timeoutInMinutes: 0
-  pool:
-    vmImage: 'macOS-11'
-  variables:
-    version_string: $[ dependencies.DetectBuildType.outputs['setvarStep.version_string'] ]
-
-  steps:
-  - script: ./scripts/azurepipeline/macos/install.sh
-    displayName: Install Build Tools
-  - script: ./scripts/azurepipeline/macos/build.sh
-    displayName: Building LuxCore
-#  - script: ./scripts/azurepipeline/macos/test.sh
-#    displayName: Testing LuxCore
-  - task: InstallAppleCertificate@2
-    inputs:
-      certSecureFile: LuxCoreSignCert.p12
-      certPwd: $(AppleCertPwd)
-  - script: ./scripts/azurepipeline/macos/pack.sh
-    displayName: Packing DiskImages
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
-      artifactName: LuxCore
-    displayName: 'Upload luxcorerender-<version>'
-    condition: eq(variables['System.PullRequest.IsFork'], 'False')
+#- job: LuxCoreRenderMacOS
+#  dependsOn: DetectBuildType
+#  condition: succeeded()
+#  timeoutInMinutes: 0
+#  pool:
+#    vmImage: 'macOS-11'
+#  variables:
+#    version_string: $[ dependencies.DetectBuildType.outputs['setvarStep.version_string'] ]
+#
+#  steps:
+#  - script: ./scripts/azurepipeline/macos/install.sh
+#    displayName: Install Build Tools
+#  - script: ./scripts/azurepipeline/macos/build.sh
+#    displayName: Building LuxCore
+##  - script: ./scripts/azurepipeline/macos/test.sh
+##    displayName: Testing LuxCore
+#  - task: InstallAppleCertificate@2
+#    inputs:
+#      certSecureFile: LuxCoreSignCert.p12
+#      certPwd: $(AppleCertPwd)
+#  - script: ./scripts/azurepipeline/macos/pack.sh
+#    displayName: Packing DiskImages
+#  - task: PublishBuildArtifacts@1
+#    inputs:
+#      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+#      artifactName: LuxCore
+#    displayName: 'Upload luxcorerender-<version>'
+#    condition: eq(variables['System.PullRequest.IsFork'], 'False')
 
 
 #==============================================================================
@@ -194,7 +194,7 @@ jobs:
   - DetectBuildType
   - LuxCoreRenderLinux
   - LuxCoreRenderWindows
-  - LuxCoreRenderMacOS
+  #- LuxCoreRenderMacOS
   variables:
     version_string: $[ dependencies.DetectBuildType.outputs['setvarStep.version_string'] ]
   condition: |
@@ -204,9 +204,8 @@ jobs:
       eq(variables['Build.SourceBranchName'], 'master'),
       eq(dependencies.DetectBuildType.outputs['setvarStep.version_string'], 'latest'),
       in(dependencies.LuxCoreRenderLinux.result, 'Succeeded', 'SucceededWithIssues'),
-      in(dependencies.LuxCoreRenderWindows.result, 'Succeeded', 'SucceededWithIssues'),
-      in(dependencies.LuxCoreRenderMacOS.result, 'Succeeded', 'SucceededWithIssues')
-    )
+      in(dependencies.LuxCoreRenderWindows.result, 'Succeeded', 'SucceededWithIssues')
+    )    
   timeoutInMinutes: 0
   pool:
     vmImage: 'ubuntu-20.04'