fix: Use SEMAPHORE_GIT_WORKING_BRANCH to associate Cloud recording to…

… current branch (#26333) * use SEMAPHORE_GIT_WORKING_BRANCH * fix issue-26309 * fix issue-26309; update changelog * Update cli/CHANGELOG.md --------- Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
cypress-io · Apr 10, 2023 · a196fb4 · a196fb4 · cypress-bot · Apr 10, 2023
1 parent bcfafda
commit a196fb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -7,6 +7,7 @@ _Released 04/11/2023 (PENDING)_
 
  - Capture the [Azure](https://azure.microsoft.com/) CI provider's environment variable [`SYSTEM_PULLREQUEST_PULLREQUESTNUMBER`](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#system-variables-devops-services) to display the linked PR number in the Cloud. Addressed in [#26215](https://github.com/cypress-io/cypress/pull/26215).
  - Fixed an issue in the onboarding wizard where project framework & bundler would not be auto-detected when opening directly into component testing mode using the `--component` CLI flag. Fixes [#22777](https://github.com/cypress-io/cypress/issues/22777).
+ - Updated to use the `SEMAPHORE_GIT_WORKING_BRANCH` [Semphore](https://docs.semaphoreci.com) CI environment variable to correctly associate a Cloud run to the current branch. Previously this was incorrectly associating a run to the target branch. Fixes [#26309](https://github.com/cypress-io/cypress/issues/26309).
  - Fix an edge case in Component Testing where a custom `baseUrl` in `tsconfig.json` for Next.js 13.2.0+ is not respected. This was partially fixed in [#26005](https://github.com/cypress-io/cypress/pull/26005), but an edge case was missed. Fixes [#25951](https://github.com/cypress-io/cypress/issues/25951).
 
 **Misc:**

diff --git a/packages/server/lib/util/ci_provider.js b/packages/server/lib/util/ci_provider.js
@@ -341,6 +341,7 @@ const _providerCiParams = () => {
       'SEMAPHORE_GIT_REPO_SLUG',
       'SEMAPHORE_GIT_SHA',
       'SEMAPHORE_GIT_URL',
+      'SEMAPHORE_GIT_WORKING_BRANCH',
       'SEMAPHORE_JOB_COUNT',
       'SEMAPHORE_JOB_ID', // v2
       'SEMAPHORE_JOB_NAME',
@@ -570,7 +571,7 @@ const _providerCommitParams = () => {
     // Only from forks? https://semaphoreci.com/docs/available-environment-variables.html
     semaphore: {
       sha: env.SEMAPHORE_GIT_SHA,
-      branch: env.SEMAPHORE_GIT_BRANCH,
+      branch: env.SEMAPHORE_GIT_WORKING_BRANCH,
       // message: ???
       // authorName: ???
       // authorEmail: ???

diff --git a/packages/server/test/unit/util/ci_provider_spec.js b/packages/server/test/unit/util/ci_provider_spec.js
@@ -885,6 +885,7 @@ describe('lib/util/ci_provider', () => {
       SEMAPHORE_CURRENT_THREAD: 'semaphoreCurrentThread',
       SEMAPHORE_EXECUTABLE_UUID: 'semaphoreExecutableUuid',
       SEMAPHORE_GIT_BRANCH: 'show-semaphore-v2-266',
+      SEMAPHORE_GIT_WORKING_BRANCH: 'show-semaphore-v2-266',
       SEMAPHORE_GIT_DIR: 'cypress-example-kitchensink',
       SEMAPHORE_GIT_REF: 'refs/heads/show-semaphore-v2-266',
       SEMAPHORE_GIT_REF_TYPE: 'branch',
@@ -917,6 +918,7 @@ describe('lib/util/ci_provider', () => {
       semaphoreCurrentThread: 'semaphoreCurrentThread',
       semaphoreExecutableUuid: 'semaphoreExecutableUuid',
       semaphoreGitBranch: 'show-semaphore-v2-266',
+      semaphoreGitWorkingBranch: 'show-semaphore-v2-266',
       semaphoreGitDir: 'cypress-example-kitchensink',
       semaphoreGitRef: 'refs/heads/show-semaphore-v2-266',
       semaphoreGitRefType: 'branch',