This commit is contained in:
Ruben Guerrero 2019-03-07 11:46:10 -08:00 коммит произвёл GitHub
Родитель 1aecf4fe11
Коммит 8411026238
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 90 добавлений и 16 удалений

Просмотреть файл

@ -145,7 +145,13 @@ Built in the Azure Pipelines Hosted VS2017 pool. See specifications [here](https
Built in the Azure Pipelines macOS pool. See specification [here](https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-Readme.md)
### iOS
TODO
||master|
|---|---|
**Debug emulator**|[![Build Status](https://dev.azure.com/ms/msix-packaging/_apis/build/status/msix-packaging%20iOS%20CI?branchName=master&configuration=debug_x86)](https://dev.azure.com/ms/msix-packaging/_build/latest?definitionId=74&branchName=master)|
**Release emulator**|[![Build Status](https://dev.azure.com/ms/msix-packaging/_apis/build/status/msix-packaging%20iOS%20CI?branchName=master&configuration=release_x86)](https://dev.azure.com/ms/msix-packaging/_build/latest?definitionId=74&branchName=master)|
**Release arm64**|[![Build Status](https://dev.azure.com/ms/msix-packaging/_apis/build/status/msix-packaging%20iOS%20CI?branchName=master&configuration=release_arm64)](https://dev.azure.com/ms/msix-packaging/_build/latest?definitionId=74&branchName=master)
Built in the Azure Pipelines macOS pool. See specification [here](https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-Readme.md)
### Android
TODO

Просмотреть файл

@ -68,7 +68,7 @@ list(APPEND XSRC
${CRYPTO}/asn1/f_string.c
${CRYPTO}/asn1/i2d_pr.c
${CRYPTO}/asn1/i2d_pu.c
${CRYPTO}/asn1/n_pkey.c
# ${CRYPTO}/asn1/n_pkey.c OPENSSL_NO_RC4
${CRYPTO}/asn1/nsseq.c
${CRYPTO}/asn1/p5_pbe.c
${CRYPTO}/asn1/p5_pbev2.c
@ -113,9 +113,9 @@ list(APPEND XSRC
${CRYPTO}/bio/bio_cb.c
${CRYPTO}/bio/bio_err.c
${CRYPTO}/bio/bio_lib.c
${CRYPTO}/bio/bss_acpt.c
# ${CRYPTO}/bio/bss_acpt.c OPENSSL_NO_SOCK
${CRYPTO}/bio/bss_bio.c
${CRYPTO}/bio/bss_conn.c
# ${CRYPTO}/bio/bss_conn.c OPENSSL_NO_SOCK
${CRYPTO}/bio/bss_fd.c
${CRYPTO}/bio/bss_file.c
${CRYPTO}/bio/bss_log.c
@ -189,9 +189,9 @@ list(APPEND XSRC
${CRYPTO}/evp/e_aes.c
${CRYPTO}/evp/e_aes_cbc_hmac_sha1.c
${CRYPTO}/evp/e_aes_cbc_hmac_sha256.c
${CRYPTO}/evp/e_null.c
${CRYPTO}/evp/e_null.c
${CRYPTO}/evp/e_old.c
${CRYPTO}/evp/e_rc4_hmac_md5.c
# ${CRYPTO}/evp/e_rc4_hmac_md5.c OPENSSL_NO_RC4
${CRYPTO}/evp/encode.c
${CRYPTO}/evp/evp_acnf.c
${CRYPTO}/evp/evp_cnf.c
@ -208,7 +208,7 @@ list(APPEND XSRC
${CRYPTO}/evp/m_sha.c
${CRYPTO}/evp/m_sha1.c
${CRYPTO}/evp/m_sigver.c
${CRYPTO}/evp/m_wp.c
# ${CRYPTO}/evp/m_wp.c OPENSSL_NO_WHIRLPOOL
${CRYPTO}/evp/names.c
${CRYPTO}/evp/p5_crpt.c
${CRYPTO}/evp/p5_crpt2.c

Просмотреть файл

@ -56,7 +56,7 @@ mkdir .vs
cd .vs
# clean up any old builds of msix modules
find . -depth -name *msix* | xargs -0 -r rm -rf
find . -name *msix* -d | xargs rm -r
cmake -DCMAKE_BUILD_TYPE=$build $zlib -DIOS=on -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.cmake -DCMAKE_OSX_ARCHITECTURES=$arch $xmlparser -DSKIP_BUNDLES=$bundle ..
make

Просмотреть файл

@ -56,7 +56,7 @@ mkdir .vs
cd .vs
# clean up any old builds of msix modules
find . -depth -name *msix* | xargs -0 -r rm -rf
find . -name *msix* -d | xargs rm -r
cmake -DCMAKE_BUILD_TYPE=$build $zlib -DSKIP_BUNDLES=$bundle $xmlparser $addressSanitizer -DMACOS=on ..
make

Просмотреть файл

@ -0,0 +1,68 @@
# Branches that trigger a build on commit
trigger:
- master
# Branches that trigger builds on PR
pr:
- master
jobs:
- job: iOS
pool:
name: Hosted macOS
strategy:
# TODO: add builds using xerces if needed.
matrix:
debug_x86:
_arguments: -b Debug
_artifact: iOS-x86chk
release_x86:
_arguments: -b MinSizeRel
_artifact: iOS-x86
release_arm64:
_arguments: -b MinSizeRel -arch arm64
_artifact: iOS-arm64
steps:
- task: Bash@3
displayName: Build
inputs:
targetType: filePath
filePath: ./makeios.sh
arguments: $(_arguments)
failOnStderr: true
condition: succeeded()
# Note: We skip BVTs in Debug mode because of assert() and release_arm64
# Only do BVTs for release_x86 because the emulator
- task: Bash@3
displayName: iOS BVTs
inputs:
targetType: filePath
filePath: './test/MacOS-Linux/testios.sh'
arguments: '-p ../mobile/iOSBVT/iOSBVT.xcodeproj'
workingDirectory: './test/MacOS-Linux'
failOnStderr: true
condition: and(succeeded(), contains(variables['Agent.JobName'], 'release_x86'))
- task: CopyFiles@2
displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)'
inputs:
SourceFolder: .vs
Contents: |
bin/makemsix
bin/makemsix.dSYM/**
lib/libmsix*
lib/libmsix*/**
src/msix/AppxPackaging.hpp
src/msix/MSIXWindows.hpp
src/msix/MsixErrors.hpp
Package.nuspec
build/**
TargetFolder: '$(Build.ArtifactStagingDirectory)'
condition: succeeded()
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact $(_artifact)'
inputs:
ArtifactName: $(_artifact)
condition: succeeded()

Просмотреть файл

@ -32,7 +32,7 @@ jobs:
# Note: We skip BVTs in Debug mode because of assert()
- task: Bash@3
displayName: 'Bash Script'
displayName: Linux BVTs
inputs:
targetType: filePath
filePath: './test/MacOS-Linux/MacOS-Linux-Etc.sh'

Просмотреть файл

@ -33,7 +33,7 @@ jobs:
# we will fail doing the test because there are no binaries
# Note: We skip BVTs in Debug mode because of assert()
- task: Bash@3
displayName: 'Bash Script'
displayName: macOS BVTs
inputs:
targetType: filePath
filePath: './test/MacOS-Linux/MacOS-Linux-Etc.sh'

Просмотреть файл

@ -1,13 +1,13 @@
#!/bin/bash
testfailed=0
device=7F47E071-9C15-4074-9837-03EC4588A562 # This is an iPhone 8 emulator
device="iPhone 8"
project=../mobile/iOSBVT/iOSBVT.xcodeproj
sdk=iphonesimulator11.4
usage()
{
echo "usage: ./testios [-d <device>] [-p <project>] [-sdk <sdk>] [-o <ouput location>]"
echo $'\t' "-d <device>. Default 7F47E071-9C15-4074-9837-03EC4588A562"
echo $'\t' "-d <device>. Default iPhone 8"
echo $'\t' "-p <project>. Default is ../mobile/iOSBVT/iOSBVT.xcodeproj"
echo $'\t' "-sdk <sdk>. Default is iphonesimulator11.4"
echo $'\t' "-o <output file>. Test result output file. Default is /private/tmp/testResults.txt"
@ -54,11 +54,11 @@ appId=`xcodebuild -showBuildSettings -project $project | grep PRODUCT_BUNDLE_IDE
printsetup
# Clean test
rm $outputFile
rm $outputFile -f
# Start emulator
echo "Starting emulator"
xcrun simctl boot $device
xcrun simctl boot "$device"
# Build app and locate .app to install
xcodebuild -scheme $app -project $project -sdk $sdk
@ -100,7 +100,7 @@ echo "Test finished"
echo "Uninstalling app and shuting down emulator"
xcrun simctl uninstall booted $appId
xcrun simctl shutdown $device
xcrun simctl shutdown "$device"
function ParseResult {
local FILE="$1"