Remove branch name

chloemorph · Mar 19, 2021 · 015dfa0 · 015dfa0
1 parent 7b7e5ec
commit 015dfa0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -299,15 +299,10 @@ jobs:
  run: |
  envType="${ENVTYPE,,}"
  envType="${envType/siteurl_/}"
- branch=""
- 
- if [[ ${GITHUB_REF} != "refs/heads/main" ]]; then
- branch="-dev"
- fi
 
  mv ./cypress/screenshots ./mochawesome-report
- ./node_modules/.bin/mochawesome-merge --reportDir mochawesome-report > mochawesome-report/$envType$branch.json
- ./node_modules/.bin/marge ./mochawesome-report/$envType$branch.json --charts -t "Doctor $envType$branch" -p "Doctor $envType$branch E2E Results"
+ ./node_modules/.bin/mochawesome-merge --reportDir mochawesome-report > mochawesome-report/$envType.json
+ ./node_modules/.bin/marge ./mochawesome-report/$envType.json --charts -t "Doctor $envType" -p "Doctor $envType E2E Results"
  find ./mochawesome-report/. -name "*.json" -type f -delete
  env:
  ENVTYPE: ${{ matrix.siteUrl }}

diff --git a/docs/content/tests/linux.md b/docs/content/tests/linux.md
@@ -7,9 +7,4 @@ keywords:
  - ''
 ---
 
-{{< main >}} 
-<iframe src="https://estruyf.github.io/doctor/linux.html" width="100%" height="1200px" />
-{{< /main >}}
-{{< dev >}} 
-<iframe src="https://estruyf.github.io/doctor/linux-dev.html" width="100%" height="1200px" />
-{{< /dev >}}
+<iframe src="https://estruyf.github.io/doctor/linux.html" width="100%" height="1200px" />
diff --git a/docs/content/tests/macos.md b/docs/content/tests/macos.md
@@ -7,9 +7,4 @@ keywords:
  - ''
 ---
 
-{{< main >}} 
-<iframe src="https://estruyf.github.io/doctor/macos.html" width="100%" height="1200px" />
-{{< /main >}}
-{{< dev >}} 
-<iframe src="https://estruyf.github.io/doctor/macos-dev.html" width="100%" height="1200px" />
-{{< /dev >}}
+<iframe src="https://estruyf.github.io/doctor/macos.html" width="100%" height="1200px" />
diff --git a/docs/content/tests/windows.md b/docs/content/tests/windows.md
@@ -7,9 +7,4 @@ keywords:
  - ''
 ---
 
-{{< main >}} 
 <iframe src="https://estruyf.github.io/doctor/windows.html" width="100%" height="1200px" />
-{{< /main >}}
-{{< dev >}} 
-<iframe src="https://estruyf.github.io/doctor/windows-dev.html" width="100%" height="1200px" />
-{{< /dev >}}
diff --git a/docs/content/tests/windows_powershell.md b/docs/content/tests/windows_powershell.md
@@ -7,9 +7,4 @@ keywords:
  - ''
 ---
 
-{{< main >}} 
-<iframe src="https://estruyf.github.io/doctor/windows_powershell.html" width="100%" height="1200px" />
-{{< /main >}}
-{{< dev >}} 
-<iframe src="https://estruyf.github.io/doctor/windows_powershell-dev.html" width="100%" height="1200px" />
-{{< /dev >}}
+<iframe src="https://estruyf.github.io/doctor/windows_powershell.html" width="100%" height="1200px" />