Merge branch 'master' into dev

Kruptein · Feb 8, 2025 · c1c96d7 · c1c96d7
2 parents 110f9fb + 3c1198c
commit c1c96d7
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 44 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -108,26 +108,6 @@ jobs:
 
             - run: python -m pip install nuitka
 
-            # - run:
-            #       name: Install pyinstaller
-            #       command: python -m pip install pyinstaller
-
-            # - run:
-            #       name: Download PyInstaller
-            #       command: Invoke-WebRequest https://github.com/pyinstaller/pyinstaller/archive/refs/tags/v5.6.2.zip -OutFile .\pyinstaller.zip
-
-            # - run: unzip.exe .\pyinstaller.zip
-
-            # - run:
-            #       name: Compile bootloader
-            #       command: cd .\pyinstaller-5.6.2\bootloader; if ($?) { python .\waf all }
-
-            # - run: cd .\pyinstaller-5.6.2; if ($?) {python .\setup.py install}
-
-            # - run:
-            #       name: Run pyinstaller
-            #       command: pyinstaller --clean -y --dist C:\Users\circleci\dist\ PA.spec
-
             - run: python -m nuitka --standalone --assume-yes-for-downloads --include-data-files=VERSION=VERSION --include-data-files=server_config.cfg=server_config.cfg --include-data-dir=static=static --include-data-dir=templates=templates --windows-icon-from-ico=static/favicon.ico ./planarally.py
 
             - run:
@@ -136,47 +116,64 @@ jobs:
                       $VERSION=$(Get-Content -TotalCount 1 VERSION)
                       Compress-Archive -Path .\planarally.dist -DestinationPath C:\Users\circleci\archives\planarally-windows-${VERSION}.zip
 
-            - run:
-                  name: Install ghr
-                  command: go install github.com/tcnksm/ghr@latest
-
-            # - when:
-            #       condition:
-            #           not:
-            #               equal: [ci-test, << pipeline.git.branch >>]
-            #       steps:
-            - run:
-                  name: Publish release on github
-                  command: |
-                      $VERSION=$(Get-Content -TotalCount 1 VERSION)
-                      ~\go\bin\ghr.exe -t $env:GITHUB_TOKEN -u $env:CIRCLE_PROJECT_USERNAME -r $env:CIRCLE_PROJECT_REPONAME -c $env:CIRCLE_SHA1 -replace $VERSION C:\Users\circleci\archives
+            - when:
+                  condition:
+                      not:
+                          equal: ["api", << pipeline.trigger_source >>]
+                  steps:
+                      - run:
+                            name: Install ghr
+                            command: go install github.com/tcnksm/ghr@latest
+                      - run:
+                            name: Publish release on github
+                            command: |
+                                $VERSION=$(Get-Content -TotalCount 1 VERSION)
+                                ~\go\bin\ghr.exe -t $env:GITHUB_TOKEN -u $env:CIRCLE_PROJECT_USERNAME -r $env:CIRCLE_PROJECT_REPONAME -c $env:CIRCLE_SHA1 -replace $VERSION C:\Users\circleci\archives
+
+            - when:
+                  condition:
+                      equal: ["api", << pipeline.trigger_source >>]
+                  steps:
+                      - store_artifacts:
+                            path: C:\Users\circleci\archives
+                            destination: archives
 
 workflows:
     version: 2
     build:
         jobs:
-            - build-windows:
-                  requires:
-                      - build-client
+            - build-client:
                   filters:
                       branches:
                           #   only: ci-test  # MAKE SURE TO CONDITION OR RENAME UPLOADED FILES TO GITHUB!!
                           ignore: /.*/
                       tags:
                           only: /^v\d+\.\d+\.\d+[-a-zA-Z0-9]*$/
-            - build-client:
+            - build-windows:
+                  # These need to be repeated for the tags for some reason
                   filters:
                       branches:
                           #   only: ci-test  # MAKE SURE TO CONDITION OR RENAME UPLOADED FILES TO GITHUB!!
                           ignore: /.*/
                       tags:
                           only: /^v\d+\.\d+\.\d+[-a-zA-Z0-9]*$/
-            - release-server:
                   requires:
                       - build-client
+            - release-server:
                   filters:
                       branches:
                           #   only: ci-test  # MAKE SURE TO CONDITION OR RENAME UPLOADED FILES TO GITHUB!!
                           ignore: /.*/
                       tags:
                           only: /^v\d+\.\d+\.\d+[-a-zA-Z0-9]*$/
+                  requires:
+                      - build-client
+    windows-test-build:
+        when:
+            # Only manual trigger from circle webapp
+            equal: ["api", << pipeline.trigger_source >>]
+        jobs:
+            - build-client
+            - build-windows:
+                  requires:
+                      - build-client
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ tech changes will usually be stripped from release notes for the public
 
 ## Unreleased
 
+## [2025.1.1] - 2025-02-08
+
+### Fixed
+
+-   pydantic version patched to 1.10.18 to fix windows build
+-   [server] docker server config did not have new keys
+
 ## [2025.1] - 2025-01-31
 
 ### Added

diff --git a/Dockerfiles/server_config_docker.cfg b/Dockerfiles/server_config_docker.cfg
@@ -28,6 +28,16 @@ ssl_privkey = cert/privkey.pem
 # Defaults to 10 * 1024 ** 2 = 10 MB
 max_upload_size_in_bytes = 10_485_760
 
+# Configuration limits for User asset uploads
+# Single asset is imply the max allowed upload size
+# Total asset is the total sum of all assets the user has uploaded
+# These settings only apply to checks done on new uploads and not on existing assets
+# (i.e. no assets will be removed if they're already over the limit when these settings are changed)
+#
+# A number <=0 means no limit
+max_single_asset_size_in_bytes = 0
+max_total_asset_size_in_bytes = 0
+
 [General]
 save_file = data/planar.sqlite
 #assets_directory = 

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "client",
-    "version": "2025.1.0",
+    "version": "2025.1.1",
     "private": true,
     "type": "module",
     "scripts": {

diff --git a/server/VERSION b/server/VERSION
@@ -1,4 +1,4 @@
-2025.1
+2025.1.1
 
 ### Added
 

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -7,5 +7,5 @@ pillow==11.0.0
 python-engineio==4.9.1
 python-socketio==5.11.4
 peewee==3.17.5
-pydantic==1.10.13
+pydantic==1.10.18
 typing_extensions==4.12.2
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-.1
+.1.1
     ### Added
@@ Expand Down @@