try customizing branch name with github vars

saucelabs · Jul 18, 2024 · 9c325a5 · 9c325a5
1 parent ef55dfc
commit 9c325a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -29,14 +29,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Build NUnit example
+      - name: Build XUnit example
         uses: docker/build-push-action@v4
         with:
           context: ./dotnet-xunit
           file: ./dotnet-xunit/Dockerfile
           push: false
           secrets: |
             "dotenv=${{ secrets.DOTENV }}"
+          build-args:
+            - GITHUB_RUN_ID=${{ GITHUB_RUN_ID }}
+            - GITHUB_RUN_ATTEMPT=${{ GITHUB_RUN_ATTEMPT }}
 
   nunit:
     runs-on: ubuntu-latest
@@ -52,4 +55,4 @@ jobs:
           file: ./dotnet-nunit/Dockerfile
           push: false
           secrets: |
-            "dotenv=${{ secrets.DOTENV }}"
+            "dotenv=${{ secrets.DOTENV }}"
diff --git a/dotnet-nunit/Dockerfile b/dotnet-nunit/Dockerfile
@@ -21,5 +21,9 @@ WORKDIR /workspace
 
 COPY . .
 
+ARG GITHUB_RUN_ID
+ARG GITHUB_RUN_ATTEMPT
+ARG SAUCE_VISUAL_BRANCH_NAME=${GITHUB_RUN_ID}${GITHUB_RUN_ATTEMPT}
+
 RUN --mount=type=secret,id=dotenv,target=/workspace/.env env $(cat /workspace/.env | xargs) runme run dotnet-test
 RUN --mount=type=secret,id=dotenv,target=/workspace/.env env $(cat /workspace/.env | xargs) runme run dotnet-test-modified
diff --git a/dotnet-nunit/SauceLabs.Visual.Example/SauceDemo.cs b/dotnet-nunit/SauceLabs.Visual.Example/SauceDemo.cs
@@ -30,7 +30,7 @@ public async Task Setup()
         {
             Name = "My Visual Build",
             Project = "csharp-project",
-            Branch = "csharp-branch"
+            Branch = Environment.GetEnvironmentVariable("SAUCE_VISUAL_BRANCH_NAME") ?? "main"
         });
         VisualClient.CaptureDom = true;
         TestContext.Progress.WriteLine($"Build: {VisualClient.Build.Url}");