build: move version into app.config.ts, not environment

techmatters · Jul 3, 2024 · 22d8653 · 22d8653
1 parent ff24e6e
commit 22d8653
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/.github/workflows/build-shared-android.yml b/.github/workflows/build-shared-android.yml
@@ -48,7 +48,6 @@ jobs:
       ENV: ${{ inputs.ENV }}
       TERRASO_BACKEND: ${{ inputs.TERRASO_BACKEND }}
       APP_BUILD: ${{ inputs.APP_BUILD }}
-      APP_VERSION: ${{ vars.APP_VERSION }}
       GOOGLE_OAUTH_ANDROID_CLIENT_ID: ${{ vars.GOOGLE_OAUTH_ANDROID_CLIENT_ID }}
       GOOGLE_OAUTH_IOS_CLIENT_ID: ${{ vars.GOOGLE_OAUTH_IOS_CLIENT_ID }}
       GOOGLE_OAUTH_IOS_URI_SCHEME: ${{ vars.GOOGLE_OAUTH_IOS_URI_SCHEME }}

diff --git a/.github/workflows/build-shared-ios.yml b/.github/workflows/build-shared-ios.yml
@@ -52,7 +52,6 @@ jobs:
       ENV: ${{ inputs.ENV }}
       TERRASO_BACKEND: ${{ inputs.TERRASO_BACKEND }}
       APP_BUILD: ${{ inputs.APP_BUILD }}
-      APP_VERSION: ${{ vars.APP_VERSION }}
       GOOGLE_OAUTH_ANDROID_CLIENT_ID: ${{ vars.GOOGLE_OAUTH_ANDROID_CLIENT_ID }}
       GOOGLE_OAUTH_IOS_CLIENT_ID: ${{ vars.GOOGLE_OAUTH_IOS_CLIENT_ID }}
       GOOGLE_OAUTH_IOS_URI_SCHEME: ${{ vars.GOOGLE_OAUTH_IOS_URI_SCHEME }}

diff --git a/.github/workflows/ios_release.yml b/.github/workflows/ios_release.yml
@@ -3,11 +3,6 @@ name: iOS Release
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: 'Version number (i.e. 1.0.1)'
-        default: '1.0.0'
-        type: string
-        required: true
       APP_BUILD:
         description: 'Build number (i.e. 153)'
         default: '153'

diff --git a/dev-client/app.config.ts b/dev-client/app.config.ts
@@ -45,7 +45,6 @@ const BUILD_CONFIG = validateEnvConfig(process.env, [
 ] as const);
 
 const ENV_CONFIG = validateEnvConfig(process.env, [
-  'APP_VERSION',
   'APP_BUILD',
   'CI',
   'ENV',
@@ -63,8 +62,6 @@ const ENV_CONFIG = validateEnvConfig(process.env, [
 ] as const);
 
 let buildNumber = 1;
-let versionNumber = '1.0';
-const APP_VERSION = process.env.APP_VERSION;
 const APP_BUILD = process.env.APP_BUILD;
 
 if (typeof APP_BUILD === 'string') {
@@ -79,16 +76,11 @@ if (typeof APP_BUILD === 'string') {
   ENV_CONFIG.APP_BUILD = buildNumber.toString();
 }
 
-if (typeof APP_VERSION === 'string') {
-  versionNumber = APP_VERSION;
-  ENV_CONFIG.APP_VERSION = versionNumber;
-}
-
 export default ({config}: ConfigContext): ExpoConfig => ({
   ...config,
   name: 'LandPKS Soil ID',
   slug: 'landpks',
-  version: versionNumber,
+  version: '1.0.0',
   orientation: 'portrait',
   splash: {
     image: 'src/assets/splash.png',

diff --git a/dev-client/src/config/index.ts b/dev-client/src/config/index.ts
@@ -76,8 +76,8 @@ export const APP_CONFIG = {
   sentryDsn: ENV_CONFIG.SENTRY_DSN,
   sentryEnabled: sentryEnabled === 'true',
   environment: ENV_CONFIG.ENV,
-  version: ENV_CONFIG.APP_VERSION,
   build: ENV_CONFIG.APP_BUILD,
+  version: Constants.expoConfig!.version,
   googleClientId,
   googleRedirectURI,
   microsoftRedirectURI,