Skip to content

Commit b884030

Browse files
committed
feat: add AVPro import
1 parent 1b246d6 commit b884030

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed

ci-build.sh

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ if [[ "$CIRCLE_BRANCH" == "main" ]]; then
1111
disable_sentry
1212
fi
1313

14+
# Only import AVPro for Desktop Builds
15+
if [[ "$BUILD_TARGET" != "WebGL" ]]; then
16+
./ci-import-avpro.sh
17+
./ci-setup-license.sh # we need to re-import the license after we import something
18+
fi
19+
1420
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
1521
-quit \
1622
-batchmode \

ci-import-avpro.sh

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env bash
2+
echo Downloading AVProVideo
3+
4+
echo "${GPG_PRIVATE_KEY_BASE64}" | base64 -d > private.gpg
5+
gpg --batch --import private.gpg
6+
curl -L 'https://renderer-artifacts.decentraland.org/artifacts/Custom_AVProVideo_2.6.7_ULTRA.unitypackage.gpg' -o Custom_AVProVideo_2.6.7_ULTRA.unitypackage.gpg
7+
8+
gpg --output Custom_AVProVideo_2.6.7_ULTRA.unitypackage --decrypt Custom_AVProVideo_2.6.7_ULTRA.unitypackage.gpg
9+
10+
echo Finished downloading AVProVideo
11+
12+
echo Begin importing AVProVideo
13+
14+
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
15+
-quit \
16+
-batchmode \
17+
-importPackage $(pwd)/Custom_AVProVideo_2.6.7_ULTRA.unitypackage \
18+
-projectPath "$PROJECT_PATH"
19+
20+
echo Ended importing AvProVideo

ci-setup-license.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
if [ -z "$DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64" ]; then
3+
echo 'DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64 not present. License won''t be configured'
4+
else
5+
LICENSE=$(echo "${DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64}" | base64 -di | tr -d '\r')
6+
7+
echo "Writing LICENSE to license file /root/.local/share/unity3d/Unity/Unity_lic.ulf"
8+
echo "$LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
9+
fi

ci-setup.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ ls -lah /root/.cache/unity3d
1919

2020
echo "UNITY PATH is $UNITY_PATH"
2121

22-
if [ -z "$DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64" ]; then
23-
echo 'DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64 not present. License won''t be configured'
24-
else
25-
LICENSE=$(echo "${DEVELOPERS_UNITY_LICENSE_CONTENT_2020_3_BASE64}" | base64 -di | tr -d '\r')
26-
27-
echo "Writing LICENSE to license file /root/.local/share/unity3d/Unity/Unity_lic.ulf"
28-
echo "$LICENSE" > /root/.local/share/unity3d/Unity/Unity_lic.ulf
29-
fi
22+
./ci-setup-license.sh
3023

3124
set -x

0 commit comments

Comments
 (0)