Revert "Switch to a build variant config instead of magic env vars (#2498)" (#2520)

.github/workflows/build_linux.yaml

@@ -145,9 +145,8 @@ jobs:
             - name: Build App
               run: yarn build --publish never -l ${{ steps.config.outputs.build-args }}
               env:
-                  VARIANT_PATH: variant.json
                   # Only set for Nightly builds
-                  VERSION: ${{ inputs.version }}
+                  ED_NIGHTLY: ${{ inputs.version }}
 
             - name: Check native libraries
               run: |

.github/workflows/build_macos.yaml

@@ -96,9 +96,8 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
                   CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
                   CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
-                  VARIANT_PATH: variant.json
                   # Only set for Nightly builds
-                  VERSION: ${{ inputs.version }}
+                  ED_NIGHTLY: ${{ inputs.version }}
 
             - name: Check app was signed & notarised successfully
               if: inputs.sign != ''
@@ -114,7 +113,6 @@ jobs:
                   yarn build:universal --publish never
               env:
                   CSC_IDENTITY_AUTO_DISCOVERY: false
-                  VARIANT_PATH: variant.json
 
             - name: Generate releases.json
               if: inputs.base-url

.github/workflows/build_prepare.yaml

@@ -85,11 +85,6 @@ jobs:
               if: steps.branch-matching.outcome == 'failure' || steps.branch-matching.outcome == 'skipped'
               run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
 
-            - name: Copy variant config
-              run: cp "$CONFIG_DIR/build.json" variant.json
-              env:
-                  CONFIG_DIR: ${{ inputs.config }}
-
             # We split this out to save the build_* scripts having to do it to make use of `hashFiles` in the cache action
             - name: Generate cache hash files
               run: |
@@ -175,4 +170,3 @@ jobs:
                       electronVersion
                       hakHash
                       changelog.Debian
-                      variant.json

.github/workflows/build_windows.yaml

@@ -193,14 +193,8 @@ jobs:
             - name: Build App
               run: yarn build --publish never -w ${{ steps.config.outputs.build-args }}
               env:
-                  VARIANT_PATH: variant.json
                   # Only set for Nightly builds
-                  # The windows packager relies on parsing this as semver, so we have to make it look like one.
-                  # This will give our update packages really stupid names, but we probably can't change that either
-                  # because squirrel windows parses them for the version too. We don't really care: nobody sees them.
-                  # We just give the installer a static name, so you'll just see this in the 'about' dialog.
-                  # Turns out if you use 0.0.0 here it makes Squirrel windows crash, so we use 0.0.1.
-                  VERSION: ${{ inputs.version && format('0.0.1-nightly.{0}', inputs.version) || '' }}
+                  ED_NIGHTLY: ${{ inputs.version }}
 
             - name: Trust eSigner sandbox cert
               if: inputs.sign == ''