Skip to content

Commit 5e9c79c

Browse files
committed
test artifacts, include testing for alpine, cleanup
1 parent 75f4774 commit 5e9c79c

File tree

5 files changed

+6
-34
lines changed

5 files changed

+6
-34
lines changed

.azurepipelines/artifacts-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ jobs:
22
- ${{ each distro in parameters.distros }}:
33
- ${{ each dotnetVersion in parameters.dotnetVersions }}:
44
- job:
5-
condition: or( ne('${{ distro }}', 'alpine.3.10-x64'), ne('${{ dotnetVersion }}', '3.1'))
65
displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
76
pool:
87
vmImage: ${{ parameters.vmImage }}

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ jobs:
105105
os: [linux]
106106
targetFramework: [2.1, 3.1]
107107
distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
108-
exclude:
109-
# for some reason this is not working on CI, but works locally
110-
- targetFramework: 3.1
111-
distro: alpine.3.10-x64
112108
fail-fast: false
113109

114110
steps:

azure-pipelines.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,34 +55,24 @@ stages:
5555
- Test
5656
condition: succeeded()
5757
jobs:
58-
# - template: .azurepipelines/generate-job.yml
5958
- template: .azurepipelines/artifacts-test.yml
6059
parameters:
6160
name: Linux
6261
vmImage: 'ubuntu-latest'
6362
distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
6463
dotnetVersions: [ '2.1', '3.1' ]
65-
# - template: .azurepipelines/artifacts-test.yml
66-
# parameters:
67-
# name: Windows
68-
# vmImage: 'windows-latest'
6964

7065
- stage: Docker
7166
displayName: 'Docker Build & Test'
7267
dependsOn: Artifact_Test
7368
condition: succeeded()
7469
jobs:
75-
# - template: .azurepipelines/generate-job.yml
7670
- template: .azurepipelines/docker.yml
7771
parameters:
7872
name: Linux
7973
vmImage: 'ubuntu-latest'
8074
distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
8175
dotnetVersions: [ '2.1', '3.1' ]
82-
# - template: .azurepipelines/docker.yml
83-
# parameters:
84-
# name: Windows
85-
# vmImage: 'windows-latest'
8676

8777
- stage: Publish
8878
displayName: 'Publish'

build/artifacts-test.cake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ Task("Artifacts-MsBuildCore-Test")
111111
{
112112
var (os, distro, targetframework) = dockerImage;
113113

114+
// TODO investigate
115+
if (distro == "alpine.3.10-x64" && targetframework == "netcoreapp3.1") {
116+
Information("Skipping this combination, works locally, not in CI for some reason");
117+
continue;
118+
}
119+
114120
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
115121

116122
DockerTestArtifact(dockerImage, parameters, cmd);

src/Docker/docker.ps1

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)