Commit Graph

1417 Commits

Author SHA1 Message Date
b3b46f89b2 Fix T100757: error stating OpenEXR format is unknown format
Fix T100757 by reducing the log level to "info" when Blender writes output
to a file format the Worker cannot handle. Such cases are expected, and
now no longer result in an error message.
2022-09-12 12:40:06 +02:00
1ffd56939a Manager: match Windows paths in two-way variables also with slashes
When doing two-way variable replacement, if the variable has a Windows
path (i.e. backslashes) also do a match for the value with forward slashes.

In other words, if a path `Y:/shared/...` comes in, and the variable value
is (correctly) `Y:\shared\...`, it will be seen as a match.
2022-09-01 15:27:31 +02:00
8368feebac Fix unit test
The recent change in error message caused a test to fail, this is now
fixed. No functional changes.
2022-09-01 15:17:04 +02:00
38b45419ae Website: add "command exited abnormally with code 1" explanation to FAQ 2022-09-01 14:47:12 +02:00
f423d68ab3 Website: move FAQ section up
The FAQ section was quite invisible, because it was sitting between the
much bigger Usage and Development sections. It's now easier to spot in the
TOC.
2022-09-01 14:46:59 +02:00
46792ee164 Clarify "job etag mismatch" situation
When a submitted job is refused because of a mismatched etag, there is
now a more explanatory error logged on the Manager. The website also has
an entry in the FAQ for this, as I expect more people to run into this
issue when they upgrade Flamenco.
2022-09-01 14:46:30 +02:00
626c146444 Website: link to changelog 2022-08-31 17:59:08 +02:00
0863dceedc Website: add step to 'how to release' list
Add a step for updating the CHANGELOG.md file, to mark the version as
released today.
2022-08-31 17:52:44 +02:00
de500ba1df Bumped version to 3.0-beta3 2022-08-31 17:50:46 +02:00
570a82d822 Make: correctly quote the 'git commit' command 2022-08-31 17:50:46 +02:00
7e53d31645 CHANGELOG: mark 3.0-beta3 as released today 2022-08-31 17:48:33 +02:00
ff7218d7aa Update CHANGELOG.md 2022-08-31 17:28:51 +02:00
780a9f9ef6 Refactor some tests to use require. instead of assert. + fail
The `require.XXX` functions are exactly the same as `assert.XXX`
functions + directly failing the test, so this refactor simplifies the
code quite a bit. Can be done in more areas than this.

No functional changes.
2022-08-31 17:28:19 +02:00
0afde53209 Simple Blender Render: no longer render to intermediate directory
Simple Blender Render now no longer renders to an intermediate directory.
This not only simplifies the script, but it also opens the door for
selective re-running of individual tasks.

In the old situation, where the intermediate directory was renamed to
the desired name in the last task, rerunning tasks would fail because the
directory they expect to exist no longer exists. This is now resolved.
2022-08-31 17:24:31 +02:00
f065cda830 Cleanup: remove some debug prints from Simple Blender Render script 2022-08-31 16:25:52 +02:00
2e1c0b83bf Simple Blender Render: refuse to render videos
The original idea behind this job type was that it would work equally
well for videos as for images, but that was never really well tested.
It's currently broken, so this commit removes video support altogether.
2022-08-31 16:25:23 +02:00
eb89984db8 Simple Blender Render: remove blender_cmd setting
Remove the `blender_cmd` setting, and just hard-code it to `{blender}`.
The Blender add-on was already passing this string, and it's very unlikely
that people are already writing custom add-ons to pass something different.
It provided flexibility that was untested, so it's better to simplify
things.
2022-08-31 16:24:34 +02:00
25dd7b214b Manager: remove superfluous "error compiling job: " prefix from message
The wrapped error already mentioned it was about job compilation.
2022-08-31 16:23:10 +02:00
fa69cc102b Add-on: clearer error message when job compiler refuses the job
Blender now shows the actual returned error from the Manager when job
submission fails, rather than a generic "failed" message.
2022-08-31 16:22:34 +02:00
6f876658c1 Add-on: remove debug print 2022-08-31 16:04:00 +02:00
4fda35f563 Webapp: don't log all task updates to the JavaScript console
Just a little performance tweak.
2022-08-31 15:57:01 +02:00
Sam Miller
5a25952167 Website: Fix documentation of Flamenco Worker YAML task types list
The example on the project website is incorrect:

```
task_types: blender, ffmpeg, file-management, misc
```

It results in an error:

```
loading configuration: yaml: unmarshal errors:\n line 2:
  cannot unmarshal ||str "blender..." into []string
```

The fix seems to be adding square brackets around the list of comma
delineated tasks:

```
task_types: [blender, ffmpeg, file-management, misc]
```

This results in output with the confirmation that
`taskType=["blender","ffmpeg","file-management","misc"]`
2022-08-31 15:42:58 +02:00
6e401f882f Worker: fix typo 'FFmepg' -> 'FFmpeg'
Just a logging message fix, no functional changes.
2022-08-31 15:34:42 +02:00
e394e75f64 update-version: also update latest version on project website
`make update-version` now also updates
`web/project-website/data/flamenco.yaml` so that the new version is
listed as the latest one on flamenco.blender.org.

Note that such a change will only be visible online after publishing the
site with `make project-website`. Be sure to only do this after the
build has been uploaded there, to avoid dead links.
2022-08-31 15:14:46 +02:00
f64ba3e0be Update CHANGELOG.md 2022-08-31 15:08:32 +02:00
9da75eef04 Worker: fix issue running FFmpeg
The `exeArg` command parameter was incorrectly always expected. It's now
optional, as it should be.
2022-08-31 15:00:46 +02:00
a70bfb87d0 Make: prevent repeating version strings
In the case where the current git HEAD matches the latest release tag,
the version reported by Flamenco was something like
`3.0-beta2-3.0-beta2`, where the first is `$VERSION` and the other is
`$GITHASH`.

This is now prevented, and `$GITHASH` will always be something that's
not a repeat of `$VERSION`.
2022-08-31 14:27:53 +02:00
f2947cc133 Website: add instructions on how to release a new version of Flamenco 2022-08-31 12:43:16 +02:00
5402444d5b Website: add link to SHA256 checksum file 2022-08-31 12:37:24 +02:00
e4a7708cb6 Make: include sha256sum when publishing packages 2022-08-31 12:34:25 +02:00
f16c62abc0 Make: fix publishing of packages
Fix some path inconsistencies between Windows package and the others.
2022-08-31 12:34:09 +02:00
5ff13265a0 Website: bump latest available Flamenco version to 3.0-beta2 2022-08-31 12:26:10 +02:00
fae82d32fc Website: add upgrade information
Add steps on how to upgrade to the download page. This is aimed at
upgrading beta1 to beta2, and thus suggests nuking the install and
starting afresh.
2022-08-31 12:26:01 +02:00
db3e3f0d12 Update CHANGELOG.md
Add a few links to commits, and mark 3.0-beta2 as released today.
2022-08-31 12:15:56 +02:00
de8da6eac5 Bumped version to 3.0-beta2 2022-08-31 12:10:02 +02:00
3ecdeacc80 Add-on: fix wrong parameter being passed 2022-08-31 12:08:46 +02:00
31cf0a4ecc Implement getSharedStorage operation & use it in the add-on
Implement the `getSharedStorage` operation in the Manager, and use it in
the add-on to get the shared storage location in a way that makes sense
for the platform of the user.

Manifest task: T100196
2022-08-31 11:44:37 +02:00
31769bcdf2 Manager: always set config.currentGOOS
This variable is used in tests to mock the current OS, but wasn't set
during normal operation of the Manager. This caused issues with the
two-way variable system.
2022-08-31 11:43:28 +02:00
0a1e1efc41 OAPI: regenerate code 2022-08-31 11:42:46 +02:00
48a1c06277 OAPI: add operation to get the shared storage, for current platform
Add an operation `getSharedStorage` that can return the shared storage
location, adjusted for the given audience & platform. This uses the
two-way variables system to adjust the Manager's configuration.
2022-08-31 11:38:14 +02:00
bb377e7572 Add-on: fix typo causing an AttributeError 2022-08-31 11:37:16 +02:00
413e5c71e2 Add-on: fix mypy warning
No functional changes.
2022-08-31 11:35:31 +02:00
59f41d0546 Add-on: show warning when versions are not matching
Before submitting a job, the add-on now checks the version of the Manager.
If this is not the same version of the add-on, a warning is shown and a
"Force Submit" button appears. This makes it both explicit that something
is iffy and still allows for pushing forward.

This is important when upgrading Flamenco, because I'm sure many people
will forget to actually redownload and reinstall the add-on.
2022-08-31 09:27:50 +02:00
2eae682b9a Manager: actually return the short version in the GetVersion operation 2022-08-31 08:58:59 +02:00
ffaaf78c8c OAPI: regenerate code 2022-08-31 08:58:47 +02:00
f7366c87ce OAPI: include "short version" in the FlamencoVersion schema
Include a `shortversion` property in the `FlamencoVersion` schema, which
will just be the version number with the release phase (and not the git
hash, the number of commits since the last tag, and the `-dirty` suffix).
2022-08-31 08:58:05 +02:00
0b176eda96 Add-on: include error cause in "Error performing BAT pack" message
The error can get cryptic, but without opening the terminal people
otherwise would have no idea what's going on.
2022-08-31 08:09:11 +02:00
a7510f4042 Cleanup: addon, split ping_manager() into two functions
Split the `comms.ping_manager()` function into two: one that returns the
version & config of the Manager, and the other that reports on it.

This will make it possible to do the former without the latter in certain
other situations where we want to refresh the manager info in the
background.
2022-08-31 08:08:06 +02:00
4761e3d76e Website: replace note-hint with 'expand' block
It's slightly less distracting now.
2022-08-30 18:03:17 +02:00
d88587f989 Website: split up variables section & adjust for argument split
Split up the "Variables" section, and adjust the wording for the splitting
of `{blender}` into `{blender}` and `{blenderArgs}` (rFe5a20425c474).
2022-08-30 18:01:10 +02:00