Merge pull request #48 from fosslight/develop

Modify to run github action for all branches when PR is created.
fosslight · Jan 13, 2022 · b924e54 · b924e54
2 parents 13b3bcd + 8fcacbc
commit b924e54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -4,7 +4,8 @@ name: Pull requests fosslight_util
 
 on:
   pull_request:
-    branches: [ main ]
+    branches:
+      - '*'
 
 jobs:
   build:

diff --git a/src/fosslight_util/write_opossum.py b/src/fosslight_util/write_opossum.py
@@ -116,9 +116,7 @@ def get_externalAttribution_dict(self):
         dict[licenseName] = self.licenseName
         dict[preSelected] = self.preSelected
 
-        if self.source_name == FL_SOURCE:
-            dict[copyright] = self.copyright
-        elif self.source_name == FL_BINARY:
+        if self.source_name == FL_SOURCE or FL_BINARY:
             dict[copyright] = self.copyright
             dict[packageName] = self.packageName
             dict[packageVersion] = self.packageVersion
@@ -264,7 +262,7 @@ def make_resources_and_attributions(sheet_items, scanner, resources, fc_list):
             if scanner == FL_SOURCE:
                 if (os.path.join(os.sep, path) + os.sep) not in fc_list:
                     resources = make_resources(path, resources)
-                attribution = Attribution(scanner, license, exclude, copyright)
+                attribution = Attribution(scanner, license, exclude, copyright, oss_name, oss_version, url)
             elif scanner == FL_BINARY:
                 resources = make_resources(path, resources)
                 attribution = Attribution(scanner, license, exclude, copyright, oss_name, oss_version, url)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,8 @@ name: Pull requests fosslight_util @@
     on:
       pull_request:
-        branches: [ main ]
+        branches:
+          - '*'
     jobs:
       build:
@@ Expand Down @@