Skip to content

Commit

Permalink
Merge pull request facebook#78 from dannyvv/pr/Compliant
Browse files Browse the repository at this point in the history
Make pipeline compliant
  • Loading branch information
dannyvv authored Feb 18, 2022
2 parents 9cccf75 + 8156ac4 commit be24986
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 67 deletions.
3 changes: 0 additions & 3 deletions .ado/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ pr:
pool:
vmImage: 'windows-latest'

variables:
- template: variables.yml

jobs:
- template: jobs.yml
67 changes: 12 additions & 55 deletions .ado/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,7 @@
jobs:
- job: HermesBuildAll
- job: Build
timeoutInMinutes: 120
displayName: (PR) Build the Hermes binary for supported architectures and flavors
strategy:
matrix:
DebugX64:
BuildConfiguration: debug
BuildPlatform: x64
DebugX86:
BuildConfiguration: debug
BuildPlatform: x86
DebugARM:
BuildConfiguration: debug
BuildPlatform: arm
DebugARM64:
BuildConfiguration: debug
BuildPlatform: arm64
ReleaseX64:
BuildConfiguration: release
BuildPlatform: x64
ReleaseX86:
BuildConfiguration: release
BuildPlatform: x86
ReleaseARM:
BuildConfiguration: release
BuildPlatform: arm
ReleaseARM64:
BuildConfiguration: release
BuildPlatform: arm64

steps:
- task: PowerShell@2
displayName: Run the build script
enabled: false
inputs:
targetType: filePath
filePath: $(Build.SourcesDirectory)\.ado\scripts\cibuild.ps1
arguments:
-SourcesPath:$(Build.SourcesDirectory)
-OutputPath:$(Build.ArtifactStagingDirectory)
-Platform:$(BuildPlatform)
-Configuration:$(BuildConfiguration)
-AppPlatform:uwp

- task: PublishBuildArtifacts@1
displayName: "Publish artifacts"
inputs:
artifactName: HermesArtifacts
pathtoPublish: $(Build.ArtifactStagingDirectory)

- job: HermesBuildForPublish
timeoutInMinutes: 120
displayName: (Publish) Build the Hermes binary for supported architectures and flavors
displayName: Build Hermes
strategy:
matrix:
DebugX64:
Expand Down Expand Up @@ -92,7 +42,11 @@ jobs:
-Configuration:$(BuildConfiguration)
-AppPlatform:uwp

- script: echo TODO - Add Tests here
displayName: '[Test] - To be Added via bug #77'

- script: mkdir $(Build.ArtifactStagingDirectory)\_manifest\$(BuildPlatform)\$(BuildFlavor)
displayName: 📒 Prep for Manifest

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 📒 Generate Manifest
Expand All @@ -114,10 +68,12 @@ jobs:
SearchPattern: $(Build.ArtifactStagingDirectory)/**/*.pdb
SymbolServerType: TeamServices

- job: HermesPublishNuget
- task: ComponentGovernanceComponentDetection@0

- job: CreateNuGet
dependsOn:
- HermesBuildForPublish
displayName: Publish Nuget
- Build
displayName: Create Nuget packages
steps:
- checkout: none

Expand Down Expand Up @@ -161,6 +117,7 @@ jobs:

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 📒 Generate Manifest NuGet
condition: not(eq(variables['Build.Reason'], 'PullRequest'))
inputs:
BuildDropPath: $(System.DefaultWorkingDirectory)\NugetRootFinal

Expand Down
12 changes: 9 additions & 3 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ pr: none
trigger:
- main

pool:
vmImage: 'OE-OfficePublic'
pool: OE-OfficePublic

variables:
- template: variables.yml
- group: Hermes-Windows Secrets
- group: InfoSec-SecurityResults
- name: ArtifactServices.Symbol.AccountName
value: microsoft
- name: ArtifactServices.Symbol.PAT
value: $(pat-symbols-publish-microsoft)
- name: tags
value: production,externalfacing

jobs:
- template: jobs.yml
6 changes: 0 additions & 6 deletions .ado/variables.yml

This file was deleted.

9 changes: 9 additions & 0 deletions GuardianCustomConfiguration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Enabled": true,
"Tools": {
"ESLint": {
"Enabled": false,
"_justification": "This repo does not ship any javascript code. But has many test cases for the js engine that fail parsing, have code considered insecure and crash eslint."
}
}
}

0 comments on commit be24986

Please sign in to comment.