Skip to content

Commit 702176c

Browse files
authored
Doug/fix gitlab main flow (#2)
* Added fixes for missing commit-sha option. Added option to export SBOM file. Added node, npm, and yarn to Dockerfile * Fixed how to check for the gitlab workflow
1 parent 0a83c4d commit 702176c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "socketsecurity"
7-
version = "0.0.72"
7+
version = "0.0.74"
88
requires-python = ">= 3.9"
99
dependencies = [
1010
'requests',

socketsecurity/core/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626

2727
__author__ = 'socket.dev'
28-
__version__ = '0.0.72'
28+
__version__ = '0.0.74'
2929
__all__ = [
3030
"Core",
3131
"log",

socketsecurity/core/gitlab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def __init__(self):
147147
@staticmethod
148148
def check_event_type() -> str:
149149
if ci_pipeline_source.lower() == "push" or ci_pipeline_source.lower() == 'merge_request_event':
150-
if ci_merge_request_iid is None or ci_merge_request_iid == "":
150+
if ci_merge_request_iid is None or ci_merge_request_iid == "" or str(ci_merge_request_iid) == "0":
151151
event_type = "main"
152152
else:
153153
event_type = "diff"

socketsecurity/socketcli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
)
4040
parser.add_argument(
4141
'--pr_number',
42-
default=0,
42+
default="0",
4343
help='The pr or build number',
4444
required=False
4545
)

0 commit comments

Comments
 (0)