Merge pull request #1036 from Difegue/dev

0.9.2 hotfix

.github/workflows/push-continous-delivery.yml

@@ -90,12 +90,12 @@ jobs:
       run: |
         docker build -t difegue/lanraragi -f ./tools/build/docker/Dockerfile-legacy --build-arg INSTALL_PARAMETER=-w .
         docker create --name rootfs difegue/lanraragi 
-        docker export --output=package.tar rootfs
+        docker export --output=package-legacy.tar rootfs
     - name: Upload rootfs
       uses: actions/upload-artifact@v4
       with:
         name: package-legacy
-        path: package.tar 
+        path: package-legacy.tar 
 
   buildNightlyWSL:
     name: Build Nightly Windows Packages
@@ -111,6 +111,8 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: package-legacy
+    - name: Display structure of downloaded files
+      run: ls -R
     - name: Build MSI Installer
       shell: powershell
       run: |
@@ -131,8 +133,10 @@ jobs:
       with:
         name: LANraragi.msi
         path: ./tools/build/windows/Karen/LRR_WSL2.msi
+        if-no-files-found: error
     - name: Upload Installer
       uses: actions/upload-artifact@v4
       with:
         name: LANraragi_legacy.msi
         path: ./tools/build/windows/Karen/LRR_WSL1.msi
+        if-no-files-found: error

.github/workflows/release-delivery.yml

@@ -50,6 +50,7 @@ jobs:
       with:
         name: LANraragi.msi
         path: ./tools/build/windows/Karen/LRR_WSL2.msi
+        if-no-files-found: error
   uploadWSLRelease:
     name: Add Windows Installer to release
     needs: buildReleaseWSL
@@ -58,13 +59,13 @@ jobs:
     - name: Download package
       uses: actions/download-artifact@v4
       with:
-        name: wsl
+        name: LANraragi.msi
     - name: Upload Installer to release
       uses: JasonEtco/upload-to-release@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        args: wsl/LRR_WSL2.msi application/octet-stream
+        args: ./LRR_WSL2.msi application/octet-stream
     - uses: Ilshidur/action-discord@master
       env:
         DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

lib/LANraragi/Model/Stats.pm

@@ -169,12 +169,6 @@ sub build_tag_stats {
         # detect the : symbol and only use what's after it
         my $ns = "";
         my $t  = redis_decode($_);
-
-        #  Ignore tags that start with "source:" or "date_added:"
-        if ($t =~ /^source:/ || $t =~ /^date_added:/) {
-            next;
-        }
-
         if ( $t =~ /([^:]*):(.*)/ ) { $ns = $1; $t = $2; }
 
         if ( $_ ne "" ) {

package.json

@@ -1,7 +1,7 @@
 {
     "name": "lanraragi",
-    "version": "0.9.20",
-    "version_name": "Telling Lies",
+    "version": "0.9.21",
+    "version_name": "Telling Lies (Paradox mix)",
     "description": "I'm under Japanese influence and my honor's at stake!",
     "scripts": {
         "test": "prove -r -l -v tests/",
@@ -52,4 +52,4 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0"
     }
-}
+}

public/js/stats.js

@@ -21,6 +21,9 @@ Stats.initializeAll = function () {
             // Buildup detailed stats
             const tagList = $("#tagList");
             data.forEach((tag) => {
+                // Ignore tags that start with "source:" or "date_added:"
+                if (tag.namespace === 'source' || tag.namespace === 'date_added')
+                    return;
                 const namespacedTag = LRR.buildNamespacedTag(tag.namespace, tag.text);
                 const url = LRR.getTagSearchURL(tag.namespace, tag.text);
 

tools/build/windows/build.ps1

@@ -9,7 +9,7 @@ echo "Version is $version"
 $env:LRR_VERSION_NUM=$version
 
 # Use Docker image
-mv .\package\package.tar .\tools\build\windows\Karen\External\package.tar 
+mv .\package.tar .\tools\build\windows\Karen\External\package.tar 
 
 # Use Karen master
 cd .\tools\build\windows\Karen
@@ -24,13 +24,13 @@ mv .\Setup\bin\LANraragi.msi .\LRR_WSL2.msi
 
 # Do it again for legacy image if it exists
 cd ..\..\..\..
-if (Test-Path .\package-legacy\package.tar) {
+if (Test-Path .\package-legacy.tar) {
     echo "WSL1 package found, building legacy version..."
 } else {
     echo "No WSL1 package found, skipping legacy build..."
     exit 0
 }
-mv .\package-legacy\package.tar .\tools\build\windows\Karen\External\package.tar 
+mv .\package-legacy.tar .\tools\build\windows\Karen\External\package.tar -Force
 cd .\tools\build\windows\Karen
 msbuild /p:Configuration=Release /p:DefineConstants=WSL1_LEGACY