Fix CI (#37)

Co-authored-by: Mateo Miccino <[email protected]>
decentraland · Apr 20, 2023 · eae3aa0 · eae3aa0
1 parent 46a6c50
commit eae3aa0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -40,6 +40,13 @@ jobs:
         env:
           UNITY_2021_ULF: ${{ secrets.UNITY_2021_ULF }}
 
+      - name: Run tests
+        run: 
+          docker run \
+            -v $(pwd)/tmp/Unity:/root/.local/share/unity3d/Unity \
+            quay.io/decentraland/asset-bundle-converter@${{ steps.docker_build.outputs.digest }} \
+              ./ci-editmode-test.sh
+
       - name: Run test conversion of urn:decentraland:off-chain:base-avatars:brown_pants
         run: |
           docker run \
@@ -51,9 +58,6 @@ jobs:
                 --outDir /tmp-ab \
                 --logFile /tmp-ab/log.txt
 
-      - name: Run tests
-        run: chmod +x ./ci-editmode-test.sh && ./ci-editmode-test.sh
-
       - name: Trigger deployment
         id: deploy
         uses: decentraland/dcl-deploy-action@main

diff --git a/ci-editmode-test.sh b/ci-editmode-test.sh
@@ -4,9 +4,6 @@ source ci-setup.sh
 
 echo "Running editmode tests for $PROJECT_PATH"
 
-# Disable Sentry
-disable_sentry
-
 xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
   -batchmode \
   -projectPath "$PROJECT_PATH" \
@@ -19,12 +16,6 @@ xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Edito
 # Catch exit code
 UNITY_EXIT_CODE=$?
 
-# Print unity log output
-ls -la $PROJECT_PATH
-find /tmp/workspace/unity-renderer -name editmode-results.xml
-find $PROJECT_PATH -name editmode-results.xml
-cat "$PROJECT_PATH/editmode-results.xml"
-
 # Display results
 if [ $UNITY_EXIT_CODE -eq 0 ]; then
   echo "Run succeeded, no failures occurred";

diff --git a/ci-setup.sh b/ci-setup.sh
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-function disable_sentry()
-{
-  # Disable Sentry
-  sed -i 's/<Enabled>k__BackingField: 1/<Enabled>k__BackingField: 0/' unity-renderer/Assets/Resources/Sentry/SentryOptions.asset
-}
-
 export PROJECT_PATH
 PROJECT_PATH="$(pwd)/unity-renderer"
 

diff --git a/convert-asset-bundles.sh b/convert-asset-bundles.sh
@@ -10,8 +10,6 @@ mkdir -p "$OUTPUT_DIR"
 echo "Running AB converter for sceneId $SCENE_ID at $CONTENT_URL > $OUTPUT_DIR"
 echo "Project path: $PROJECT_PATH"
 
-disable_sentry
-
 xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' "$UNITY_PATH/Editor/Unity" \
   -batchmode \
   -projectPath "$PROJECT_PATH" \