Skip to content

Commit 8651304

Browse files
committed
build: Set a different channel for local builds
That way we can differentiate easily between a local build and an official release. It's also the first step towards supporting stable releases.
1 parent b3bd108 commit 8651304

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/release_nightly.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
- name: Cargo build
130130
run: cargo build --locked --package ruffle_desktop --release ${{matrix.DESKTOP_FEATURES && '--features' }} ${{matrix.DESKTOP_FEATURES}} ${{ matrix.target && '--target' }} ${{ matrix.target }}
131131
env:
132+
CFG_RELEASE_CHANNEL: nightly
132133
RUSTFLAGS: ${{ matrix.RUSTFLAGS }}
133134
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.MACOSX_DEPLOYMENT_TARGET }}
134135

@@ -178,6 +179,7 @@ jobs:
178179
if: runner.os == 'macOS'
179180
run: cargo build --locked --package ruffle_web_safari --release ${{ matrix.target && '--target' }} ${{ matrix.target }}
180181
env:
182+
CFG_RELEASE_CHANNEL: nightly
181183
RUSTFLAGS: ${{ matrix.RUSTFLAGS }}
182184
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.MACOSX_DEPLOYMENT_TARGET }}
183185

@@ -368,13 +370,15 @@ jobs:
368370
shell: bash -l {0}
369371
working-directory: web
370372
env:
373+
CFG_RELEASE_CHANNEL: nightly
371374
BUILD_ID: ${{ github.run_number }}
372375
ENABLE_VERSION_SEAL: "true"
373376
FIREFOX_EXTENSION_ID: ${{ secrets.FIREFOX_EXTENSION_ID }} # Needed to inject into manifest.json
374377
run: npm run version-seal
375378

376379
- name: Build web
377380
env:
381+
CFG_RELEASE_CHANNEL: nightly
378382
BUILD_ID: ${{ github.run_number }}
379383
CARGO_FEATURES: jpegxr
380384
FIREFOX_EXTENSION_ID: ${{ secrets.FIREFOX_EXTENSION_ID }} # Needed to inject into manifest.json
@@ -518,13 +522,15 @@ jobs:
518522
shell: bash -l {0}
519523
working-directory: web
520524
env:
525+
CFG_RELEASE_CHANNEL: nightly
521526
BUILD_ID: ${{ github.run_number }}
522527
ENABLE_VERSION_SEAL: "true"
523528
FIREFOX_EXTENSION_ID: ${{ secrets.FIREFOX_EXTENSION_ID }} # Needed to inject into manifest.json
524529
run: npm run version-seal
525530

526531
- name: Build web
527532
env:
533+
CFG_RELEASE_CHANNEL: nightly
528534
BUILD_ID: ${{ github.run_number }}
529535
# NOTE: In the future, we might want to enable some features (like `webgpu`) only in
530536
# the demo build, for limited testing (like a Chrome origin trial) on ruffle.rs.

desktop/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ fn channel() -> String {
4343
if let Ok(channel) = env::var("CFG_RELEASE_CHANNEL") {
4444
channel
4545
} else {
46-
"nightly".to_owned()
46+
"local".to_owned()
4747
}
4848
}

web/packages/core/tools/set_version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import path from "path";
55

66
let buildDate = new Date().toISOString();
77
let versionNumber = process.env["npm_package_version"] ?? "";
8-
let versionChannel = process.env["CFG_RELEASE_CHANNEL"] || "nightly";
8+
let versionChannel = process.env["CFG_RELEASE_CHANNEL"] || "local";
99
const firefoxExtensionId =
1010
process.env["FIREFOX_EXTENSION_ID"] || "[email protected]";
1111

web/packages/extension/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function transformManifest(content, env) {
1212
const manifest = json5.parse(content.toString());
1313

1414
let packageVersion = process.env["npm_package_version"];
15-
let versionChannel = process.env["CFG_RELEASE_CHANNEL"] || "nightly";
15+
let versionChannel = process.env["CFG_RELEASE_CHANNEL"] || "local";
1616
let buildDate = new Date().toISOString().substring(0, 10);
1717
let buildId = process.env["BUILD_ID"];
1818
let firefoxExtensionId =

web/packages/selfhosted/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function transformPackage(content) {
88

99
const packageVersion = process.env.npm_package_version;
1010

11-
const versionChannel = process.env.CFG_RELEASE_CHANNEL || "nightly";
11+
const versionChannel = process.env.CFG_RELEASE_CHANNEL || "local";
1212

1313
const buildDate = new Date()
1414
.toISOString()

0 commit comments

Comments
 (0)