Skip to content

Commit fb95b9b

Browse files
Merge pull request decentraland#6243 from decentraland/release/release20240802
Release: 20240802
2 parents bf9648c + d74c812 commit fb95b9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+10
-746
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,10 @@ jobs:
228228
sudo apt-get install -y jq
229229
- checkout
230230
- run:
231-
name: Update sentry params and Components and Renderer Protocol code generation
231+
name: Update Components and Renderer Protocol code generation
232232
command: |
233233
cd scripts
234234
npm install
235-
npm run inject-sentry-params
236235
npm run build-protocol
237236
238237
# persist to workspace to use in downstream jobs

ci-benchmark.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ source ci-setup.sh
44

55
echo "Running benchmark tests for $PROJECT_PATH"
66

7-
disable_sentry
8-
97
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
108
-batchmode \
119
-projectPath "$PROJECT_PATH" \

ci-editmode-test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ source ci-setup.sh
44

55
echo "Running editmode tests for $PROJECT_PATH"
66

7-
# Disable Sentry
8-
disable_sentry
9-
107
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
118
-batchmode \
129
-projectPath "$PROJECT_PATH" \

ci-playmode-test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ source ci-setup.sh
44

55
echo "Running playmode tests for $PROJECT_PATH"
66

7-
# Disable Sentry
8-
disable_sentry
9-
107
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' $UNITY_PATH/Editor/Unity \
118
-batchmode \
129
-projectPath "$PROJECT_PATH" \

ci-setup.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#!/usr/bin/env bash
22

3-
function disable_sentry()
4-
{
5-
# Disable Sentry
6-
sed -i 's/<Enabled>k__BackingField: 1/<Enabled>k__BackingField: 0/' unity-renderer/Assets/Resources/Sentry/SentryOptions.asset
7-
}
8-
93
export PROJECT_PATH
104
PROJECT_PATH="$(pwd)/unity-renderer"
115

convert-asset-bundles.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ mkdir -p "$OUTPUT_DIR"
1010
echo "Running AB conversor for sceneId $SCENE_ID at $CONTENT_URL > $OUTPUT_DIR"
1111
echo "Project path: $PROJECT_PATH"
1212

13-
disable_sentry
14-
1513
xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' "$UNITY_PATH/Editor/Unity" \
1614
-batchmode \
1715
-projectPath "$PROJECT_PATH" \

scripts/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "1.0.0",
44
"description": "",
55
"scripts": {
6-
"inject-sentry-params": "ts-node --project src/tsconfig.json src/inject-sentry-params.ts",
76
"build-protocol": "ts-node --project src/tsconfig.json src/build-protocol.ts"
87
},
98
"private": true,

scripts/src/inject-sentry-params.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

unity-renderer/Assets/DCLPlugins/SentryPlugin.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

unity-renderer/Assets/DCLPlugins/SentryPlugin/DCL.Plugins.SentryPlugin.asmdef

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)