diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a17b920d5a..2d10012f87a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -371,20 +371,6 @@ jobs: cache: true run-install: true - - name: Download relay client tracing config - uses: actions/download-artifact@v8 - with: - name: relay-client-tracing-config - path: ${{ runner.temp }}/relay-client-tracing - - - name: Load relay client tracing config - shell: bash - run: | - config_path="$RUNNER_TEMP/relay-client-tracing/relay-client-tracing.env" - tracing_token="$(sed -n 's/^T3CODE_RELAY_CLIENT_OTLP_TRACES_TOKEN=//p' "$config_path")" - echo "::add-mask::$tracing_token" - cat "$config_path" >> "$GITHUB_ENV" - - name: Align package versions to release version run: node scripts/update-release-package-versions.ts "${{ needs.preflight.outputs.version }}" @@ -668,20 +654,6 @@ jobs: - --filter=@t3tools/web... - --filter=@t3tools/scripts... - - name: Download relay client tracing config - uses: actions/download-artifact@v8 - with: - name: relay-client-tracing-config - path: ${{ runner.temp }}/relay-client-tracing - - - name: Load relay client tracing config - shell: bash - run: | - config_path="$RUNNER_TEMP/relay-client-tracing/relay-client-tracing.env" - tracing_token="$(sed -n 's/^T3CODE_RELAY_CLIENT_OTLP_TRACES_TOKEN=//p' "$config_path")" - echo "::add-mask::$tracing_token" - cat "$config_path" >> "$GITHUB_ENV" - - name: Align package versions to release version run: node scripts/update-release-package-versions.ts "${{ needs.preflight.outputs.version }}" @@ -844,20 +816,6 @@ jobs: - --filter=@t3tools/scripts... - --filter=@t3tools/web... - - name: Download relay client tracing config - uses: actions/download-artifact@v8 - with: - name: relay-client-tracing-config - path: ${{ runner.temp }}/relay-client-tracing - - - name: Load relay client tracing config - shell: bash - run: | - config_path="$RUNNER_TEMP/relay-client-tracing/relay-client-tracing.env" - tracing_token="$(sed -n 's/^T3CODE_RELAY_CLIENT_OTLP_TRACES_TOKEN=//p' "$config_path")" - echo "::add-mask::$tracing_token" - cat "$config_path" >> "$GITHUB_ENV" - - name: Align package versions to release version run: node scripts/update-release-package-versions.ts "${{ needs.preflight.outputs.version }}" diff --git a/FORK.md b/FORK.md index 71981dc1eb4..e65c80ecf16 100644 --- a/FORK.md +++ b/FORK.md @@ -7,6 +7,7 @@ This repository is a fork of `pingdotgg/t3code`. Keep this file focused on fork ### Release And CI - Fork workflows disable scheduled releases, relay jobs, hosted deploys, and fork-unsafe publish paths. +- Release build jobs skip relay client tracing config because the relay config job is disabled. - Release builds publish updater metadata against the fork repository. - Fork release versions are derived in the release workflow so package manifests stay close to upstream. - macOS release signing is separate from Apple notarization. diff --git a/infra/relay/scripts/deploy.test.ts b/infra/relay/scripts/deploy.test.ts index 992cb2d887b..3e512e2818c 100644 --- a/infra/relay/scripts/deploy.test.ts +++ b/infra/relay/scripts/deploy.test.ts @@ -156,7 +156,7 @@ describe("serializeRelayClientTracingEnvironment", () => { }); describe("release workflow tracing config propagation", () => { - it.effect("uses an artifact instead of a masked cross-job token output", () => + it.effect("keeps relay tracing config isolated to the disabled relay job", () => Effect.gen(function* () { const fileSystem = yield* FileSystem.FileSystem; const path = yield* Path.Path; @@ -167,9 +167,13 @@ describe("release workflow tracing config propagation", () => { expect(workflow).not.toContain("client_tracing_token:"); expect(workflow).not.toContain("needs.relay_public_config.outputs.client_tracing_token"); + expect(workflow).toContain( + "if: ${{ false }} # Disabled for the fork: no production relay config.", + ); expect(workflow).toContain('--github-env-file "$RUNNER_TEMP/relay-client-tracing.env"'); expect(workflow).toContain("name: relay-client-tracing-config"); - expect(workflow).toContain('cat "$config_path" >> "$GITHUB_ENV"'); + expect(workflow).not.toContain('cat "$config_path" >> "$GITHUB_ENV"'); + expect(workflow).not.toContain("Download relay client tracing config"); }).pipe(Effect.provide(NodeServices.layer)), ); });