Skip to content

Commit 72f7211

Browse files
authored
Merge branch 'main' into Accessibility-improve-dashboard-text-contrast
Signed-off-by: benamar19-b <benamar1906@gmail.com>
2 parents 523ddb3 + 8395d36 commit 72f7211

35 files changed

Lines changed: 2256 additions & 46 deletions

.github/workflows/_meta-build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout Repository
48-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
48+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
4949
with:
5050
persist-credentials: false
5151

@@ -80,7 +80,7 @@ jobs:
8080

8181
steps:
8282
- name: Checkout Repository
83-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
83+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
8484
with:
8585
persist-credentials: false
8686

.github/workflows/ci-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
major: ${{ steps.parse.outputs.major }}
2929
steps:
3030
- name: Checkout Repository
31-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
31+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
3232
with:
3333
persist-credentials: false
3434

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# This file is part of Dependency-Track.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
# SPDX-License-Identifier: Apache-2.0
16+
# Copyright (c) OWASP Foundation. All Rights Reserved.
17+
name: Issue Template Check
18+
19+
on:
20+
issues:
21+
types: [ opened ]
22+
23+
permissions: { }
24+
25+
jobs:
26+
validate:
27+
name: Validate Issue Template
28+
runs-on: ubuntu-latest
29+
permissions:
30+
issues: write
31+
steps:
32+
- name: Close issues that bypass templates
33+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
34+
with:
35+
script: |
36+
const issue = context.payload.issue;
37+
38+
if (issue.user.type === 'Bot') {
39+
core.notice(`Skipping bot author '${issue.user.login}'.`);
40+
return;
41+
}
42+
43+
const templateLabels = ['defect', 'in triage', 'enhancement'];
44+
if (issue.labels.some(label => templateLabels.includes(label.name))) {
45+
core.notice('Issue carries template labels; nothing to do.');
46+
return;
47+
}
48+
49+
core.notice(`Closing issue #${issue.number}: opened without an issue template.`);
50+
51+
await github.rest.issues.createComment({
52+
...context.repo,
53+
issue_number: issue.number,
54+
body: `This issue was opened without using an issue template, which is only possible when creating issues via the GitHub API. As stated in our [contributing guidelines](https://github.com/DependencyTrack/dependency-track/blob/main/CONTRIBUTING.md#filing-issues), issues that do not use a template will be closed.
55+
56+
Please recreate this issue via the [issue chooser](https://github.com/DependencyTrack/frontend/issues/new/choose).`,
57+
});
58+
59+
await github.rest.issues.update({
60+
...context.repo,
61+
issue_number: issue.number,
62+
state: 'closed',
63+
state_reason: 'not_planned',
64+
});

.github/workflows/ci-publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fi
4141
4242
- name: Checkout Repository
43-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
43+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
4444
with:
4545
persist-credentials: false
4646

@@ -76,7 +76,7 @@ jobs:
7676
- call-build
7777
steps:
7878
- name: Checkout Repository
79-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
79+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
8080
with:
8181
persist-credentials: false
8282

.github/workflows/ci-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
timeout-minutes: 15
7070
steps:
7171
- name: Checkout Repository
72-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
72+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
7373
with:
7474
token: ${{ secrets.BOT_RELEASE_GITHUB_TOKEN }}
7575

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout Repository
20-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
20+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
2121
with:
2222
persist-credentials: false
2323
- name: Set up NodeJs
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout Repository
42-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # tag=v6.0.3
42+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # tag=v7.0.0
4343
with:
4444
persist-credentials: false
4545
- name: Set up NodeJs

docker/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginxinc/nginx-unprivileged:1.31.2-alpine@sha256:26b5d4920434bc4d8c17a68201488cf4b3d2391f0d25305cdfe66ccdc6d18aa4
1+
FROM nginxinc/nginx-unprivileged:1.31.2-alpine@sha256:054e14f543eb688809d59ec2ad1644d1a61678e247c87a318ad605977eb37eaf
22

33
# Arguments that can be passed at build time
44
ARG COMMIT_SHA=unknown

0 commit comments

Comments
 (0)