Skip to content

Commit

Permalink
Merge branch '412-switch-to-blender-2-92' into 'master'
Browse files Browse the repository at this point in the history
Resolve "Switch to Blender 2.92"

Closes #412

See merge request animation-studio/blender/mixer!251
  • Loading branch information
PhilippeCrassous committed Mar 22, 2021
2 parents cf055e9 + 6542d8f commit 03c8206
Showing 1 changed file with 2 additions and 23 deletions.
25 changes: 2 additions & 23 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ release:

.test_version_dev:
variables:
MIXER_BLENDER_ZIP_BASENAME: blender-2.91.0-windows64
MIXER_BLENDER_VERSION_BASE: "2.91"
MIXER_BLENDER_ZIP_BASENAME: blender-2.92.0-windows64
MIXER_BLENDER_VERSION_BASE: "2.92"
MIXER_BLENDER_DOWNLOAD: "release"

test_dev:
Expand Down Expand Up @@ -163,27 +163,6 @@ test_2.91.2_manual:
- .except_on_gitlab.com
when: manual

.test_version_2.92:
extends:
- .test_base
variables:
MIXER_BLENDER_VERSION_BASE: "2.92"
MIXER_BLENDER_ZIP_BASENAME: blender-2.92.0-windows64
MIXER_BLENDER_DOWNLOAD: "release"

test_2.92:
extends:
- .test_version_2.92
- .only_nightly_test
- .except_on_gitlab.com

test_2.92_manual:
extends:
- .test_version_2.92
- .except_nightly_test
- .except_on_gitlab.com
when: manual

.test_version_2.93.alpha:
extends:
- .test_base
Expand Down

0 comments on commit 03c8206

Please sign in to comment.