Merge pull request #709 from Webperf-se/software-json-move

Moved software-*.json to defaults folder
Webperf-se · Nov 9, 2024 · 1c68860 · 1c68860
2 parents 05cf830 + c6f1db7
commit 1c68860
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -14,8 +14,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/prep-release.yml b/.github/workflows/prep-release.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - main
     paths:
-      - "software-full.json"
+      - "**software-full.json"
       - "Dockerfile"
   schedule:
     #  https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule

diff --git a/.github/workflows/regression-test-404.yml b/.github/workflows/regression-test-404.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-a11y-statement.yml b/.github/workflows/regression-test-a11y-statement.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-css.yml b/.github/workflows/regression-test-css.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-email.yml b/.github/workflows/regression-test-email.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-google-lighthouse-based.yml b/.github/workflows/regression-test-google-lighthouse-based.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-html.yml b/.github/workflows/regression-test-html.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-http.yml b/.github/workflows/regression-test-http.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-pa11y.yml b/.github/workflows/regression-test-pa11y.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-sitespeed.yml b/.github/workflows/regression-test-sitespeed.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-software.yml b/.github/workflows/regression-test-software.yml
@@ -4,7 +4,7 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-sources.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'Dockerfile'
       - '**regression-test-docker-image.yml'

diff --git a/.github/workflows/regression-test-standard-files.yml b/.github/workflows/regression-test-standard-files.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-tracking.yml b/.github/workflows/regression-test-tracking.yml
@@ -8,8 +8,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-translations.yml b/.github/workflows/regression-test-translations.yml
@@ -3,8 +3,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-webbkoll.yml b/.github/workflows/regression-test-webbkoll.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/regression-test-ylt.yml b/.github/workflows/regression-test-ylt.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
-      - 'software-full.json'
-      - 'software-sources.json'
+      - '**software-full.json'
+      - '**software-sources.json'
       - '**update-software.yml'
       - 'update_software.py'
       - '**software-rules.json'

diff --git a/.github/workflows/update-software.yml b/.github/workflows/update-software.yml
@@ -70,17 +70,17 @@ jobs:
           This pull request is used to make it easier to keep the software definitions up to date.
           
           Following files may be touched:
-            - software-sources.json
-            - software-full.json
+            - defaults/software-sources.json
+            - defaults/software-full.json
             - defaults/software-rules.json
             - defaults/settings.json
             - defaults/mdn-rules.json
             - CREDITS.md
         assignees: 7h3Rabbit
         reviewers: 7h3Rabbit
         add-paths: |
-          software-sources.json
-          software-full.json
+          defaults/software-sources.json
+          defaults/software-full.json
           defaults/software-rules.json
           defaults/settings.json
           defaults/mdn-rules.json

diff --git a/software-full.json → defaults/software-full.json b/software-full.json → defaults/software-full.json
diff --git a/software-sources.json → defaults/software-sources.json b/software-sources.json → defaults/software-sources.json
diff --git a/helpers/credits_helper.py b/helpers/credits_helper.py
@@ -26,7 +26,7 @@ def get_credits(global_translation):
     base_directory = os.path.join(Path(os.path.dirname(
         os.path.realpath(__file__)) + os.path.sep).parent)
 
-    software_full_path = os.path.join(base_directory, 'software-full.json')
+    software_full_path = os.path.join(base_directory, 'defaults', 'software-full.json')
     softwares = None
     with open(software_full_path, encoding='utf-8') as json_input_file:
         tmp = json.load(json_input_file)

diff --git a/tests/software.py b/tests/software.py
@@ -605,7 +605,7 @@ def get_softwares():
 
     file_path = f'{base_directory}{os.path.sep}data{os.path.sep}software-full.json'
     if not os.path.isfile(file_path):
-        file_path = f'{base_directory}{os.path.sep}software-full.json'
+        file_path = f'{base_directory}{os.path.sep}defaults{os.path.sep}software-full.json'
     if not os.path.isfile(file_path):
         print("ERROR: No software-full.json file found!")
         return {
@@ -623,7 +623,7 @@ def add_known_software_source(name, source_type, match, url):
 
     file_path = f'{base_directory}{os.path.sep}data{os.path.sep}software-sources.json'
     if not os.path.isfile(file_path):
-        file_path = f'{base_directory}{os.path.sep}software-sources.json'
+        file_path = f'{base_directory}{os.path.sep}defaults{os.path.sep}software-sources.json'
     if not os.path.isfile(file_path):
         print("ERROR: No software-sources.json file found!")
         return