Merge branch 'main' into develop

Add time and time zone perhaps?
Remove docker ignore, not useful in this context.
2025-09-02 03:02:18 +00:00 · 2025-02-22 10:27:58 +01:00 · 2025-02-22 10:25:31 +01:00 · 2025-02-22 10:20:55 +01:00 · 2025-02-22 10:20:31 +01:00 · 2025-02-22 10:20:23 +01:00
2 changed files with 3 additions and 4 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-Procfile
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -204,9 +204,9 @@ jobs:

          # zip and tar everything
          echo 'Zip and tar...'
-          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*" "*Procfile*" "*crowdin.yml*" "*sonar-project.properties*"
          touch $tarName
-          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
+          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' --exclude='./Procfile' --exclude='../crowdin.yml' --exclude='./sonar-project.properties' -czf $tarName .

          # add sha256 sum
          echo 'Sha sum ...'
@@ -225,7 +225,7 @@ jobs:
            sudo chown -R runner:docker output.txt
            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
            echo "" >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d %H:%M') ${TZ}** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
Author	SHA1	Message	Date
James Cole	dce6754c62	Merge branch 'main' into develop	2025-02-22 10:27:58 +01:00
James Cole	f4bca90080	Add time and time zone perhaps?	2025-02-22 10:25:31 +01:00
James Cole	b2960b1ed9	Remove docker ignore, not useful in this context.	2025-02-22 10:20:55 +01:00
James Cole	33f87bce23	Merge branch 'main' into develop	2025-02-22 10:20:31 +01:00
James Cole	23aa45609b	Remove files from zip.	2025-02-22 10:20:23 +01:00