Skip to content

Commit b9b0ee0

Browse files
committed
cleanup github integrations
1 parent f271ca3 commit b9b0ee0

20 files changed

+17
-13
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2
22
updates:
33
- package-ecosystem: "pip"
4-
directory: "/examples/dependabot"
4+
directory: "/examples/github/dependabot"
55
schedule:
66
interval: "monthly"

.github/workflows/codeql-evidence-example.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
matrix:
1919
language_details:
2020
- name: javascript
21-
queries_path: ./examples/codeql/queries/js
21+
queries_path: ./examples/github/codeql/queries/js
2222
- name: go
23-
queries_path: ./examples/codeql/queries/go
23+
queries_path: ./examples/github/codeql/queries/go
2424

2525
steps:
2626
# Build and publish the packages to JFrog Artifactory
@@ -32,12 +32,12 @@ jobs:
3232
- uses: actions/checkout@v4
3333
with:
3434
sparse-checkout: |
35-
examples/codeql/**
35+
examples/github/codeql/**
3636
sparse-checkout-cone-mode: false
3737
- name: Build and Publish ${{ matrix.language_details.name }} package
3838
env:
39-
GO_CODE_PATH: examples/codeql/go
40-
JS_CODE_PATH: examples/codeql/js
39+
GO_CODE_PATH: examples/github/codeql/go
40+
JS_CODE_PATH: examples/github/codeql/js
4141
run: |
4242
if [ ${{ matrix.language_details.name }} == 'go' ]; then
4343
cd $GO_CODE_PATH
@@ -62,7 +62,7 @@ jobs:
6262
uses: github/codeql-action/init@v3
6363
with:
6464
languages: ${{ matrix.language_details.name }}
65-
config-file: examples/codeql/codeql-config.yml
65+
config-file: examples/github/codeql/codeql-config.yml
6666
queries: ${{ matrix.language_details.queries_path }}
6767

6868
- name: Run CodeQL Analysis for ${{ matrix.language_details.name }}
@@ -76,7 +76,7 @@ jobs:
7676
- name: Generate optional custom markdown report
7777
if: env.ATTACH_OPTIONAL_CUSTOM_MARKDOWN_TO_EVIDENCE == 'true'
7878
run: |
79-
python ./examples/codeql/sarif_to_markdown.py \
79+
python ./examples/github/codeql/sarif_to_markdown.py \
8080
results-${{ matrix.language_details.name }}/${{ matrix.language_details.name }}.sarif \
8181
results-${{ matrix.language_details.name }}/${{ matrix.language_details.name }}-report.md
8282
@@ -104,5 +104,6 @@ jobs:
104104
--key-alias "${{ vars.EVIDENCE_KEY_ALIAS }}" \
105105
--predicate "results-javascript/javascript.sarif" \
106106
--predicate-type "http://github.com/CodeQL/static-analysis" \
107+
--provider-id "github" \
107108
${{ env.ATTACH_OPTIONAL_CUSTOM_MARKDOWN_TO_EVIDENCE == 'true' && '--markdown "results-javascript/javascript-report.md"' || '' }}
108109
fi

.github/workflows/dependabot-evidence-example.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v4
2929
- name: Build and Push Docker Image to Artifactory
3030
run: |
31-
docker build -f ./examples/dependabot/Dockerfile . --tag $REGISTRY_DOMAIN/$REPO_NAME/$IMAGE_NAME:$VERSION
31+
docker build -f ./examples/github/dependabot/Dockerfile . --tag $REGISTRY_DOMAIN/$REPO_NAME/$IMAGE_NAME:$VERSION
3232
jf rt docker-push $REGISTRY_DOMAIN/$REPO_NAME/$IMAGE_NAME:$VERSION $REPO_NAME --build-name=$BUILD_NAME --build-number=$VERSION
3333
3434
# Fetch Dependabot Vulnerability Snapshot
@@ -64,7 +64,7 @@ jobs:
6464
IMAGE_ID=$(docker images --format "{{.ID}}" "$ARTIFACT_NAME")
6565
IMAGE_SIZE=$(docker images --format "{{.Size}}" "$ARTIFACT_NAME" | sed 's/MB//' | awk '{print $1 * 1024 * 1024}')
6666
SCAN_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
67-
python ./examples/dependabot/markdown_helper.py \
67+
python ./examples/github/dependabot/markdown_helper.py \
6868
"dependabot.json" \
6969
"dependabot_report.md" \
7070
"$REGISTRY_DOMAIN/$REPO_NAME/$IMAGE_NAME:$VERSION" \
@@ -83,4 +83,5 @@ jobs:
8383
--key-alias "${{ vars.EVIDENCE_KEY_ALIAS }}" \
8484
--predicate ./dependabot.json \
8585
--predicate-type http://Github.com/Dependabot/static-analysis \
86+
--provider-id "github" \
8687
${{ env.ATTACH_OPTIONAL_CUSTOM_MARKDOWN_TO_EVIDENCE == 'true' && '--markdown "dependabot_report.md"' || '' }}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jf evd create \
9494
--key-alias ${{ vars.CODEQL_KEY_ALIAS }} \
9595
--predicate "results-javascript/javascript.sarif" \
9696
--predicate-type "http://github.com/CodeQL/static-analysis" \
97+
--provider-id "github" \
9798
--markdown "results-javascript/javascript-report.md"
9899
```
99100

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ paths-ignore:
1313
- '**/*.spec.ts'
1414

1515
paths:
16-
- examples/codeql/
16+
- examples/github/codeql/
File renamed without changes.

0 commit comments

Comments
 (0)