Merge pull request #199 from stashapp/main

Merge main to stable for 0.24
stashapp · Dec 27, 2023 · 9993bdd · 9993bdd
2 parents 3c80094 + 1f6d6e0
commit 9993bdd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,15 +27,15 @@ jobs:
         cd main
         ./build_site.sh ../_site/develop
     # uncomment this once we have a stable branch
-    # - name: Checkout Stable
-    #   uses: actions/checkout@v2
-    #   with:
-    #     path: stable
-    #     ref: stable
-    #     fetch-depth: '0'
-    # - run: |
-    #     cd stable
-    #     ../master/build_site.sh ../_site/stable
+    - name: Checkout Stable
+      uses: actions/checkout@v2
+      with:
+        path: stable
+        ref: stable
+        fetch-depth: '0'
+    - run: |
+        cd stable
+        ../main/build_site.sh ../_site/stable
     - uses: actions/upload-pages-artifact@v2
 
   deploy:

diff --git a/build_site.sh b/build_site.sh
@@ -17,6 +17,11 @@ mkdir -p "$outdir"
 buildPlugin() 
 {
     f=$1
+
+    if grep -q "^#pkgignore" "$f"; then
+        return
+    fi
+
     # get the scraper id from the directory
     dir=$(dirname "$f")
     plugin_id=$(basename "$f" .yml)

diff --git a/plugins/comicInfoExtractor/config.yml b/plugins/comicInfoExtractor/config.yml
@@ -1,3 +1,4 @@
+#pkgignore
 #ImportList is a dictionary
 #that matches an xml Attribute from ComicInfo.xml to the according value in stash (using the graphql naming)
 #Fields that refer to different types of media are resolved by name and created if necessary (tags, studio, performers)