From 1ecba213f0dc0444d9bd8f3eb1eca432463f5ee6 Mon Sep 17 00:00:00 2001 From: Rahim Rahman Date: Fri, 28 Feb 2025 10:16:55 -0700 Subject: [PATCH] fix(MM-62375): OutOfMemoryError issue with better catching (#8622) * fix(MM-62375): OutOfMemoryError issue with gif * add APNG4Android as npm module instead --- .github/actions/prepare-node-deps/action.yaml | 11 ----------- package-lock.json | 6 ++++++ package.json | 1 + scripts/postinstall.sh | 5 ----- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/actions/prepare-node-deps/action.yaml b/.github/actions/prepare-node-deps/action.yaml index 187982588..74c6f7460 100644 --- a/.github/actions/prepare-node-deps/action.yaml +++ b/.github/actions/prepare-node-deps/action.yaml @@ -52,14 +52,3 @@ runs: cp "$COMPASS_ICONS" "assets/fonts/" cp "$COMPASS_ICONS" "android/app/src/main/assets/fonts" echo "::endgroup::" - - - name: ci/clone-APNG4Android - shell: bash - env: - APNG4Android: "node_modules/APNG4Android" - run: | - echo "::group::clone-APNG4Android" - if [ ! -d "$APNG4Android" ]; then - git clone -b "fix/MM-62375-OOM-on-gif-with-build-updates" --single-branch --depth 1 https://github.com/mattermost/APNG4Android.git "$APNG4Android"; - fi - echo "::endgroup::" diff --git a/package-lock.json b/package-lock.json index 399d94227..26922201c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "@sentry/react-native": "6.4.0", "@stream-io/flat-list-mvcp": "0.10.3", "@voximplant/react-native-foreground-service": "3.0.2", + "APNG4Android": "github:mattermost/APNG4Android#15a7e93d59542d18c1e562d49b3f4896dd1643a6", "base-64": "1.0.0", "commonmark": "npm:@mattermost/commonmark@0.30.1-4", "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#81b5d27509652bae50b4b510ede777dd3bd923cf", @@ -8487,6 +8488,11 @@ "node": ">= 8" } }, + "node_modules/APNG4Android": { + "version": "1.0.0", + "resolved": "git+ssh://git@github.com/mattermost/APNG4Android.git#15a7e93d59542d18c1e562d49b3f4896dd1643a6", + "integrity": "sha512-Aqhpb5ZvjJJPmCjwWnekWHMNOx3P4DuRzmEh+lHEdH2FiB1f/nnbQ7ex5jSXPRIEFMlLY5YnsMLsfbZ6RdZNtA==" + }, "node_modules/appdirsjs": { "version": "1.2.7", "license": "MIT" diff --git a/package.json b/package.json index 7c018d88d..fd06ca461 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@sentry/react-native": "6.4.0", "@stream-io/flat-list-mvcp": "0.10.3", "@voximplant/react-native-foreground-service": "3.0.2", + "APNG4Android": "github:mattermost/APNG4Android#15a7e93d59542d18c1e562d49b3f4896dd1643a6", "base-64": "1.0.0", "commonmark": "npm:@mattermost/commonmark@0.30.1-4", "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#81b5d27509652bae50b4b510ede777dd3bd923cf", diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index d40c10c70..6b1c32812 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -45,8 +45,3 @@ else mkdir -p "android/app/src/main/res/raw/" cp $SOUNDS/* "android/app/src/main/res/raw/" fi - -APNG4Android="node_modules/APNG4Android" -if [ ! -z "$APNG4Android" ]; then - git clone -b "fix/MM-62375-OOM-on-gif-with-build-updates" --single-branch --depth 1 https://github.com/mattermost/APNG4Android.git "$APNG4Android"; -fi \ No newline at end of file