Skip to content

Commit

Permalink
Trying feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
radical authored May 23, 2022
1 parent 3441009 commit 849760c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 39 deletions.
38 changes: 0 additions & 38 deletions eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ parameters:
# Handled as an opt-in parameter to avoid excessive yaml.
passPlatforms: false
container: ''
shouldContinueOnError: false
jobParameters: {}
variables: []

Expand All @@ -39,7 +38,6 @@ jobs:
archType: arm
targetRid: linux-arm
platform: Linux_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-arm-20220426130400-6e40d49
registry: mcr
Expand All @@ -65,7 +63,6 @@ jobs:
archType: armv6
targetRid: linux-armv6
platform: Linux_armv6
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
registry: mcr
Expand All @@ -92,7 +89,6 @@ jobs:
archType: arm64
targetRid: linux-arm64
platform: Linux_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
${{ if eq(parameters.container, '') }}:
image: ubuntu-18.04-cross-arm64-20220427171722-6e40d49
Expand Down Expand Up @@ -123,7 +119,6 @@ jobs:
archType: x64
targetRid: linux-musl-x64
platform: Linux_musl_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: alpine-3.13-WithNode-20210910135845-c401c85
registry: mcr
Expand All @@ -149,7 +144,6 @@ jobs:
archType: arm
targetRid: linux-musl-arm
platform: Linux_musl_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
registry: mcr
Expand Down Expand Up @@ -177,7 +171,6 @@ jobs:
archType: arm64
targetRid: linux-musl-arm64
platform: Linux_musl_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
registry: mcr
Expand Down Expand Up @@ -205,7 +198,6 @@ jobs:
archType: arm64
targetRid: linux-bionic-arm64
platform: Linux_bionic_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand Down Expand Up @@ -234,7 +226,6 @@ jobs:
archType: x64
targetRid: linux-bionic-x64
platform: Linux_bionic_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand All @@ -259,7 +250,6 @@ jobs:
archType: x64
targetRid: linux-x64
platform: Linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
${{ if eq(parameters.container, '') }}:
image: centos-7-20210714125435-9b5bbc2
Expand Down Expand Up @@ -287,7 +277,6 @@ jobs:
archType: x86
targetRid: linux-x86
platform: Linux_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-x86-linux-20211022152824-f853169
registry: mcr
Expand Down Expand Up @@ -315,7 +304,6 @@ jobs:
archType: x64
targetRid: linux-x64
platform: Linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: centos-7-source-build-20210714125450-5d87b80
registry: mcr
Expand All @@ -341,7 +329,6 @@ jobs:
archType: s390x
targetRid: linux-s390x
platform: Linux_s390x
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
registry: mcr
Expand All @@ -368,7 +355,6 @@ jobs:
archType: wasm
targetRid: browser-wasm
platform: Browser_wasm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-webassembly-20220317214646-1ad56e8
registry: mcr
Expand All @@ -393,7 +379,6 @@ jobs:
archType: wasm
targetRid: browser-wasm
platform: Browser_wasm_firefox
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-webassembly-20220317214646-1ad56e8
registry: mcr
Expand All @@ -418,7 +403,6 @@ jobs:
archType: wasm
targetRid: browser-wasm
platform: Browser_wasm_win
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
hostedOs: windows
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All @@ -439,7 +423,6 @@ jobs:
archType: x64
targetRid: freebsd-x64
platform: FreeBSD_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
registry: mcr
Expand All @@ -465,7 +448,6 @@ jobs:
archType: x64
targetRid: android-x64
platform: Android_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand All @@ -490,7 +472,6 @@ jobs:
archType: x86
targetRid: android-x86
platform: Android_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand All @@ -515,7 +496,6 @@ jobs:
archType: arm
targetRid: android-arm
platform: Android_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand All @@ -540,7 +520,6 @@ jobs:
archType: arm64
targetRid: android-arm64
platform: Android_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
Expand All @@ -565,7 +544,6 @@ jobs:
archType: x64
targetRid: maccatalyst-x64
platform: MacCatalyst_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -587,7 +565,6 @@ jobs:
archType: arm64
targetRid: maccatalyst-arm64
platform: MacCatalyst_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -609,7 +586,6 @@ jobs:
archType: arm64
targetRid: tvos-arm64
platform: tvOS_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -631,7 +607,6 @@ jobs:
archType: x64
targetRid: tvossimulator-x64
platform: tvOSSimulator_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -653,7 +628,6 @@ jobs:
archType: arm64
targetRid: tvossimulator-arm64
platform: tvOSSimulator_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -675,7 +649,6 @@ jobs:
archType: arm
targetRid: ios-arm
platform: iOS_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -697,7 +670,6 @@ jobs:
archType: arm64
targetRid: ios-arm64
platform: iOS_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -719,7 +691,6 @@ jobs:
archType: x64
targetRid: iossimulator-x64
platform: iOSSimulator_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -741,7 +712,6 @@ jobs:
archType: x86
targetRid: iossimulator-x86
platform: iOSsimulator_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -764,7 +734,6 @@ jobs:
archType: arm64
targetRid: iossimulator-arm64
platform: iOSSimulator_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -786,7 +755,6 @@ jobs:
archType: arm64
targetRid: osx-arm64
platform: OSX_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -809,7 +777,6 @@ jobs:
archType: x64
targetRid: osx-x64
platform: OSX_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -831,7 +798,6 @@ jobs:
archType: armel
targetRid: tizen-armel
platform: Tizen_armel
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
registry: mcr
Expand Down Expand Up @@ -859,7 +825,6 @@ jobs:
archType: x64
targetRid: win-x64
platform: windows_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -881,7 +846,6 @@ jobs:
archType: x86
targetRid: win-x86
platform: windows_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -902,7 +866,6 @@ jobs:
archType: arm
targetRid: win-arm
platform: windows_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -924,7 +887,6 @@ jobs:
archType: arm64
targetRid: win-arm64
platform: windows_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/wasm-debugger-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
buildConfig: Release
runtimeFlavor: mono
platforms: ${{ parameters.platforms }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
variables:
# map dependencies variables to local variables
- name: wasmdebuggertestsContainsChange
Expand All @@ -28,6 +27,7 @@ jobs:
testGroup: innerloop
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
nameSuffix: Mono_DebuggerTests_${{ parameters.browser }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmDebuggerTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:DebuggerHost=${{ parameters.browser }}
timeoutInMinutes: 180
condition: >-
Expand Down

0 comments on commit 849760c

Please sign in to comment.