Skip to content

Commit 55bedea

Browse files
davidkniseJiandongJiangprashmoj0tr
authored
release/vNext (#60)
* Upgrade dependencies * Upgrade to codeql-action v2 * Point wiki to the new codql-action v2 * Upgarde to node16 actions in samples * Remove on PR sample build * Consume updates to use REST API to install MSDO CLI (#55) * v1.7.0-beta.3 * v1.7.0-beta.3 - remove dotnet install from sample pipelines * v1.7.0-beta.3 - update defaults * v1.7.0-beta.3 - reference exported functions * v1.7.0-beta.3 - reference common.isNullOrWhiteSpace * v1.7.0-beta.4 - fix lib errors * v1.7.0 - set license * Dev/davidknise/sample matrix os (#62) * Update samples to use strategy matrix for multi-os verification * Use @v1 branch in the sample repo * v1.7.0 - use release version of actions toolkit * Use gulp.js for building * v1.7.0 - fix name of on push verification pipeline * v1.7.0 - fix name of on push verification pipeline Signed-off-by: David Knise <[email protected]> * Rename enable-pr-annotations to enable-pr-annotations.yml Signed-off-by: prashmo <[email protected]> Signed-off-by: David Knise <[email protected]> * Update README.md Updating supported IaC files Signed-off-by: JTT <[email protected]> Signed-off-by: David Knise <[email protected]> * Upgrade dependencies Signed-off-by: David Knise <[email protected]> * Upgrade to codeql-action v2 Signed-off-by: David Knise <[email protected]> * Point wiki to the new codql-action v2 Signed-off-by: David Knise <[email protected]> * Upgarde to node16 actions in samples Signed-off-by: David Knise <[email protected]> * Remove on PR sample build Signed-off-by: David Knise <[email protected]> * Add AntiMalware to README.md Signed-off-by: David Knise <[email protected]> * Consume updates to use REST API to install MSDO CLI (#55) Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.3 Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.3 - remove dotnet install from sample pipelines Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.3 - update defaults Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.3 - reference exported functions Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.3 - reference common.isNullOrWhiteSpace Signed-off-by: David Knise <[email protected]> * v1.7.0-beta.4 - fix lib errors Signed-off-by: David Knise <[email protected]> * v1.7.0 - set license Signed-off-by: David Knise <[email protected]> * Dev/davidknise/sample matrix os (#62) * Update samples to use strategy matrix for multi-os verification * Use @v1 branch in the sample repo Signed-off-by: David Knise <[email protected]> * v1.7.0 - use release version of actions toolkit Signed-off-by: David Knise <[email protected]> * Use gulp.js for building Signed-off-by: David Knise <[email protected]> * v1.7.0 - fix name of on push verification pipeline Signed-off-by: David Knise <[email protected]> --------- Signed-off-by: David Knise <[email protected]> Signed-off-by: prashmo <[email protected]> Signed-off-by: JTT <[email protected]> Co-authored-by: Jiandong Jiang <[email protected]> Co-authored-by: prashmo <[email protected]> Co-authored-by: JTT <[email protected]> Co-authored-by: Jiandong Jiang <[email protected]>
1 parent 7fe28e7 commit 55bedea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+18864
-967
lines changed

‎.github/workflows/enable-pr-annotations.yml‎

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

‎.github/workflows/on-push-verification.yml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
# pull request action verification
22

3-
name: MSDO on-push-verification windows-latest
4-
on: push
3+
name: MSDO On Push Verification
4+
on:
5+
push:
6+
branches:
7+
- '*'
58

69
jobs:
710
sample:
8-
name: Microsoft Security DevOps Analysis
11+
name: MSDO on ${{ matrix.os }}
12+
runs-on: ${{ matrix.os }}
913

10-
# MSDO runs on windows-latest.
11-
# ubuntu-latest and macos-latest supporting coming soon
12-
runs-on: windows-latest
14+
strategy:
15+
matrix:
16+
os: [windows-latest, ubuntu-latest]
1317

1418
steps:
1519

1620
# Checkout your code repository to scan
1721
- uses: actions/checkout@v3
1822

19-
# Install dotnet, used by MSDO
20-
- uses: actions/setup-dotnet@v3
21-
with:
22-
dotnet-version: |
23-
3.1.x
24-
5.0.x
25-
6.0.x
26-
2723
# Run analyzers
2824
- name: Run Microsoft Security DevOps Analysis
2925
uses: ./

‎.github/workflows/sample-workflow-windows-latest.yml‎

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

.github/workflows/sample-workflow-ubuntu-latest.yml renamed to .github/workflows/sample-workflow.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
1-
name: MSDO ubuntu-latest
1+
name: MSDO Sample Workflow
22
on:
33
push:
44
branches:
55
- main
66

77
jobs:
88
sample:
9-
name: Microsoft Security DevOps Analysis
9+
name: MSDO on ${{ matrix.os }}
10+
runs-on: ${{ matrix.os }}
1011

11-
# MSDO runs on windows-latest.
12-
# ubuntu-latest and macos-latest supporting coming soon
13-
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
os: [windows-latest, ubuntu-latest]
1415

1516
steps:
1617

1718
# Checkout your code repository to scan
1819
- uses: actions/checkout@v3
1920

20-
# Install dotnet, used by MSDO
21-
- uses: actions/setup-dotnet@v3
22-
with:
23-
dotnet-version: |
24-
3.1.x
25-
5.0.x
26-
6.0.x
27-
2821
# Run analyzers
2922
- name: Run Microsoft Security DevOps Analysis
30-
uses: microsoft/security-devops-action@preview
23+
uses: microsoft/security-devops-action@v1
3124
id: msdo
3225

3326
# Upload alerts to the Security tab

‎.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
registry=https://registry.npmjs.org/
2+
@microsoft:registry=https://npm.pkg.github.com/

‎README.md‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Microsoft Security DevOps (MSDO) is a command line application which integrates
44

55
Run locally. Run remotely.
66

7-
![Microsoft Security DevOps windows-latest](https://github.com/microsoft/security-devops-action/workflows/MSDO%20windows-latest/badge.svg)
8-
![Microsoft Security DevOps ubuntu-latest](https://github.com/microsoft/security-devops-action/workflows/MSDO%20ubuntu-latest/badge.svg)
7+
![Microsoft Security DevOps](https://github.com/microsoft/security-devops-action/workflows/MSDO%20Sample%20Workflow/badge.svg)
98

109
This action runs the [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) for security analysis:
1110

@@ -17,10 +16,6 @@ This action runs the [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget)
1716
* Normalized processing of results into the SARIF format
1817
* Build breaks and more
1918

20-
# Limitations
21-
22-
The Microsoft Security DevOps action is currently in beta and runs on the `windows-latest` queue, as well as Windows self hosted agents. `ubuntu-latest` support coming soon.
23-
2419
# Usage
2520

2621
See [action.yml](action.yml)
@@ -31,19 +26,12 @@ Run **Microsoft Security DevOps (MSDO)** with the default policy and recommended
3126

3227
```yaml
3328
steps:
29+
3430
- uses: actions/checkout@v3
35-
- uses: actions/setup-dotnet@v3
36-
with:
37-
dotnet-version: |
38-
5.0.x
39-
6.0.x
31+
4032
- name: Run Microsoft Security DevOps
41-
uses: microsoft/security-devops-action@preview
33+
uses: microsoft/security-devops-action@v1
4234
id: msdo
43-
- name: Upload results to Security tab
44-
uses: github/codeql-action/upload-sarif@v2
45-
with:
46-
sarif_file: ${{ steps.msdo.outputs.sarifFile }}
4735
```
4836
4937
## Upload Results to the Security tab

‎build.proj‎

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

‎gulpfile.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const gulp = require('gulp');
2+
const shell = require('gulp-shell');
3+
const ts = require('gulp-typescript');
4+
5+
const tsProject = ts.createProject('tsconfig.json');
6+
7+
function clean(cb) {
8+
import('del')
9+
.then((del) => del.deleteSync(['lib']))
10+
.then(() => cb());
11+
}
12+
13+
function compile(cb) {
14+
tsProject
15+
.src()
16+
.pipe(tsProject()).js
17+
.pipe(gulp.dest('lib'));
18+
cb();
19+
}
20+
21+
exports.clean = clean;
22+
exports.compile = compile;
23+
exports.build = gulp.series(clean, compile);
24+
exports.default = exports.build;

0 commit comments

Comments
 (0)