From 7ada116ef04c5880bedef54c619fdb9e039ef871 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 28 Jul 2025 17:45:45 -0500 Subject: [PATCH] Just fallback to package version for Render deploys --- Dockerfile | 2 +- src/env/common.ts | 2 ++ webpack.config.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2d757a7b6..43d7f4eb48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG RENDER_GIT_COMMIT ARG EXPO_PUBLIC_ENV ENV EXPO_PUBLIC_ENV=${EXPO_PUBLIC_ENV:-development} ARG EXPO_PUBLIC_RELEASE_VERSION -ENV EXPO_PUBLIC_RELEASE_VERSION=${EXPO_PUBLIC_RELEASE_VERSION:-0.0.0} +ENV EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER # If not set by GitHub workflows, we're probably in Render ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-$RENDER_GIT_COMMIT} diff --git a/src/env/common.ts b/src/env/common.ts index 3e27ea757a..31f811e2fe 100644 --- a/src/env/common.ts +++ b/src/env/common.ts @@ -4,6 +4,8 @@ import packageJson from '#/../package.json' /** * The semver version of the app, as defined in `package.json.` + * + * N.B. The fallback is needed for Render.com deployments */ export const RELEASE_VERSION: string = process.env.EXPO_PUBLIC_RELEASE_VERSION || packageJson.version diff --git a/webpack.config.js b/webpack.config.js index e807dff239..7f58a7448a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,6 +3,7 @@ const {withAlias} = require('@expo/webpack-config/addons') const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin') const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer') const {sentryWebpackPlugin} = require('@sentry/webpack-plugin') +const {version} = require('./package.json') const GENERATE_STATS = process.env.EXPO_PUBLIC_GENERATE_STATS === '1' const OPEN_ANALYZER = process.env.EXPO_PUBLIC_OPEN_ANALYZER === '1' @@ -52,7 +53,8 @@ module.exports = async function (env, argv) { project: 'app', authToken: process.env.SENTRY_AUTH_TOKEN, release: { - name: process.env.SENTRY_RELEASE, + // fallback needed for Render.com deployments + name: process.env.SENTRY_RELEASE || version, dist: process.env.SENTRY_DIST, }, }),