From 6df635f8ff11eceb80f277fe0d599f767fa0f555 Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <oleksandr.red+github@gmail.com>
Date: Thu, 27 Jun 2024 19:10:58 +0300
Subject: [PATCH] Fix eng content tests; run tests via GitHub Actions (#263)

---
 .github/workflows/pr.yml                      | 19 ++++++++
 .../eng/algorithms/fun/freq_concurrent.go     |  2 +
 _content/tour/eng/arrays/example2.go          |  2 +-
 _content/tour/eng/channels/example10.go       |  2 +-
 .../eng/composition/assertions/example1.go    |  2 +-
 .../eng/composition/decoupling/exercise1.go   |  2 +-
 .../tour/eng/composition/grouping/example1.go |  2 +-
 .../tour/eng/composition/mocking/example1.go  |  2 +-
 _content/tour/eng/constants/example4.go       |  2 +-
 _content/tour/eng/context/answer1.go          |  2 +-
 _content/tour/eng/context/example5.go         |  2 +-
 _content/tour/eng/context/exercise1.go        |  2 +-
 _content/tour/eng/data_race/example5.go       |  2 +-
 _content/tour/eng/data_race/example6.go       |  2 +-
 _content/tour/eng/error-handling/example4.go  |  2 +-
 _content/tour/eng/error-handling/example5.go  |  2 +-
 _content/tour/eng/error-handling/exercise1.go |  2 +-
 _content/tour/eng/error-handling/exercise2.go |  2 +-
 _content/tour/eng/exporting/answer1.go        |  2 +-
 _content/tour/eng/exporting/example1.go       |  2 +-
 _content/tour/eng/exporting/example2.go       |  2 +-
 _content/tour/eng/exporting/example3.go       |  2 +-
 _content/tour/eng/exporting/example4.go       |  2 +-
 _content/tour/eng/exporting/example5.go       |  2 +-
 _content/tour/eng/exporting/exercise1.go      |  2 +-
 .../generics/type-constraints/exercise1.go    |  2 +-
 _content/tour/eng/interfaces/example2.go      |  2 +-
 _content/tour/eng/interfaces/example3.go      |  2 +-
 _content/tour/eng/interfaces/example4.go      |  2 +-
 _content/tour/eng/interfaces/example6.go      |  2 +-
 _content/tour/eng/maps/example3.go            |  2 +-
 _content/tour/eng/maps/example6.go            |  2 +-
 _content/tour/eng/maps/example8.go            |  2 +-
 _content/tour/eng/methods/example5.go         |  2 +-
 _content/tour/eng/methods/exercise1.go        |  2 +-
 _content/tour/eng/slices/example1.go          |  2 +-
 _content/tour/eng/slices/example8.go          |  2 +-
 _content/tour/eng/static/partials/list.html   | 16 ++-----
 _content/tour/eng/template/index.tmpl         |  2 +-
 _content/tour/eng/welcome/sandbox.go          |  2 +
 _content/tour/fre/template/index.tmpl         |  2 +-
 _content/tour/ger/template/index.tmpl         |  2 +-
 _content/tour/grc/template/index.tmpl         |  2 +-
 _content/tour/ita/template/index.tmpl         |  2 +-
 _content/tour/per/template/index.tmpl         |  2 +-
 _content/tour/pol/template/index.tmpl         |  2 +-
 _content/tour/por/template/index.tmpl         |  2 +-
 _content/tour/rus/template/index.tmpl         |  2 +-
 _content/tour/tur/template/index.tmpl         |  2 +-
 .../eng/content_test.go => content_test.go    | 48 +++++++++----------
 50 files changed, 95 insertions(+), 82 deletions(-)
 create mode 100644 .github/workflows/pr.yml
 rename _content/tour/eng/content_test.go => content_test.go (54%)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 00000000..b4568988
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,19 @@
+name: Continuous Integration
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.22
+
+      - name: Run tests
+        run: go test -v ./...
diff --git a/_content/tour/eng/algorithms/fun/freq_concurrent.go b/_content/tour/eng/algorithms/fun/freq_concurrent.go
index 3b91df41..edfa678f 100644
--- a/_content/tour/eng/algorithms/fun/freq_concurrent.go
+++ b/_content/tour/eng/algorithms/fun/freq_concurrent.go
@@ -1,3 +1,5 @@
+//go:build OMIT
+
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/_content/tour/eng/arrays/example2.go b/_content/tour/eng/arrays/example2.go
index ce6e4299..5c41c454 100644
--- a/_content/tour/eng/arrays/example2.go
+++ b/_content/tour/eng/arrays/example2.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/channels/example10.go b/_content/tour/eng/channels/example10.go
index e680c74a..ed01faa0 100644
--- a/_content/tour/eng/channels/example10.go
+++ b/_content/tour/eng/channels/example10.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/composition/assertions/example1.go b/_content/tour/eng/composition/assertions/example1.go
index 5d1191cb..f0e81147 100644
--- a/_content/tour/eng/composition/assertions/example1.go
+++ b/_content/tour/eng/composition/assertions/example1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/composition/decoupling/exercise1.go b/_content/tour/eng/composition/decoupling/exercise1.go
index db2f3a41..98bd38df 100644
--- a/_content/tour/eng/composition/decoupling/exercise1.go
+++ b/_content/tour/eng/composition/decoupling/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/composition/grouping/example1.go b/_content/tour/eng/composition/grouping/example1.go
index 474b91ca..59d0bea8 100644
--- a/_content/tour/eng/composition/grouping/example1.go
+++ b/_content/tour/eng/composition/grouping/example1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/composition/mocking/example1.go b/_content/tour/eng/composition/mocking/example1.go
index e72930c1..445b6e18 100644
--- a/_content/tour/eng/composition/mocking/example1.go
+++ b/_content/tour/eng/composition/mocking/example1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/constants/example4.go b/_content/tour/eng/constants/example4.go
index 1b735f9c..64560df1 100644
--- a/_content/tour/eng/constants/example4.go
+++ b/_content/tour/eng/constants/example4.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/context/answer1.go b/_content/tour/eng/context/answer1.go
index 8291bcf3..49fca71b 100644
--- a/_content/tour/eng/context/answer1.go
+++ b/_content/tour/eng/context/answer1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/context/example5.go b/_content/tour/eng/context/example5.go
index cf819766..a04854fa 100644
--- a/_content/tour/eng/context/example5.go
+++ b/_content/tour/eng/context/example5.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/context/exercise1.go b/_content/tour/eng/context/exercise1.go
index d7225c6c..cf7d6224 100644
--- a/_content/tour/eng/context/exercise1.go
+++ b/_content/tour/eng/context/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/data_race/example5.go b/_content/tour/eng/data_race/example5.go
index dd7cb0fc..fda16cd5 100644
--- a/_content/tour/eng/data_race/example5.go
+++ b/_content/tour/eng/data_race/example5.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/data_race/example6.go b/_content/tour/eng/data_race/example6.go
index 61243b57..8ab7578d 100644
--- a/_content/tour/eng/data_race/example6.go
+++ b/_content/tour/eng/data_race/example6.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/error-handling/example4.go b/_content/tour/eng/error-handling/example4.go
index 40f8303e..5e2e7f48 100644
--- a/_content/tour/eng/error-handling/example4.go
+++ b/_content/tour/eng/error-handling/example4.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/error-handling/example5.go b/_content/tour/eng/error-handling/example5.go
index de920b11..4c677b32 100644
--- a/_content/tour/eng/error-handling/example5.go
+++ b/_content/tour/eng/error-handling/example5.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/error-handling/exercise1.go b/_content/tour/eng/error-handling/exercise1.go
index 0fb21e45..378257d8 100644
--- a/_content/tour/eng/error-handling/exercise1.go
+++ b/_content/tour/eng/error-handling/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/error-handling/exercise2.go b/_content/tour/eng/error-handling/exercise2.go
index 59310aa9..e2883ef2 100644
--- a/_content/tour/eng/error-handling/exercise2.go
+++ b/_content/tour/eng/error-handling/exercise2.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/answer1.go b/_content/tour/eng/exporting/answer1.go
index f0abc4c6..dcd28e17 100644
--- a/_content/tour/eng/exporting/answer1.go
+++ b/_content/tour/eng/exporting/answer1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/example1.go b/_content/tour/eng/exporting/example1.go
index 5cd1820c..a828b2f6 100644
--- a/_content/tour/eng/exporting/example1.go
+++ b/_content/tour/eng/exporting/example1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/example2.go b/_content/tour/eng/exporting/example2.go
index cec2201e..91735097 100644
--- a/_content/tour/eng/exporting/example2.go
+++ b/_content/tour/eng/exporting/example2.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/example3.go b/_content/tour/eng/exporting/example3.go
index 00a1dda7..1ba82103 100644
--- a/_content/tour/eng/exporting/example3.go
+++ b/_content/tour/eng/exporting/example3.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/example4.go b/_content/tour/eng/exporting/example4.go
index f2b0174a..93d06902 100644
--- a/_content/tour/eng/exporting/example4.go
+++ b/_content/tour/eng/exporting/example4.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/example5.go b/_content/tour/eng/exporting/example5.go
index 70da23ed..8ae0fa09 100644
--- a/_content/tour/eng/exporting/example5.go
+++ b/_content/tour/eng/exporting/example5.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/exporting/exercise1.go b/_content/tour/eng/exporting/exercise1.go
index bafbd5a5..4ff23346 100644
--- a/_content/tour/eng/exporting/exercise1.go
+++ b/_content/tour/eng/exporting/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/generics/type-constraints/exercise1.go b/_content/tour/eng/generics/type-constraints/exercise1.go
index 01dd1324..13c74e40 100644
--- a/_content/tour/eng/generics/type-constraints/exercise1.go
+++ b/_content/tour/eng/generics/type-constraints/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/interfaces/example2.go b/_content/tour/eng/interfaces/example2.go
index a9e10aa4..3b56f6fd 100644
--- a/_content/tour/eng/interfaces/example2.go
+++ b/_content/tour/eng/interfaces/example2.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/interfaces/example3.go b/_content/tour/eng/interfaces/example3.go
index 2ed6c756..cbd2a139 100644
--- a/_content/tour/eng/interfaces/example3.go
+++ b/_content/tour/eng/interfaces/example3.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/interfaces/example4.go b/_content/tour/eng/interfaces/example4.go
index acb8e2f6..e8cab8ba 100644
--- a/_content/tour/eng/interfaces/example4.go
+++ b/_content/tour/eng/interfaces/example4.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/interfaces/example6.go b/_content/tour/eng/interfaces/example6.go
index 68825182..5187153e 100644
--- a/_content/tour/eng/interfaces/example6.go
+++ b/_content/tour/eng/interfaces/example6.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/maps/example3.go b/_content/tour/eng/maps/example3.go
index a1fb2fa6..a9913573 100644
--- a/_content/tour/eng/maps/example3.go
+++ b/_content/tour/eng/maps/example3.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/maps/example6.go b/_content/tour/eng/maps/example6.go
index bfffd74e..e79d9f1a 100644
--- a/_content/tour/eng/maps/example6.go
+++ b/_content/tour/eng/maps/example6.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/maps/example8.go b/_content/tour/eng/maps/example8.go
index 359f752a..0d72d9e7 100644
--- a/_content/tour/eng/maps/example8.go
+++ b/_content/tour/eng/maps/example8.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/methods/example5.go b/_content/tour/eng/methods/example5.go
index fb0d8cf7..13275785 100644
--- a/_content/tour/eng/methods/example5.go
+++ b/_content/tour/eng/methods/example5.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/methods/exercise1.go b/_content/tour/eng/methods/exercise1.go
index 555d0ef1..8e09f37c 100644
--- a/_content/tour/eng/methods/exercise1.go
+++ b/_content/tour/eng/methods/exercise1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || nobuild
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/slices/example1.go b/_content/tour/eng/slices/example1.go
index 36f418d4..f86c3764 100644
--- a/_content/tour/eng/slices/example1.go
+++ b/_content/tour/eng/slices/example1.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/slices/example8.go b/_content/tour/eng/slices/example8.go
index af4361da..ad9b748d 100644
--- a/_content/tour/eng/slices/example8.go
+++ b/_content/tour/eng/slices/example8.go
@@ -1,4 +1,4 @@
-//go:build OMIT
+//go:build OMIT || norun
 
 // All material is licensed under the Apache License Version 2.0, January 2004
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/_content/tour/eng/static/partials/list.html b/_content/tour/eng/static/partials/list.html
index cb17d3fc..4dbf93cf 100644
--- a/_content/tour/eng/static/partials/list.html
+++ b/_content/tour/eng/static/partials/list.html
@@ -2,13 +2,10 @@
     <div settitle="'Home'" class="container">
         <div class="page-header">
             <h1>Ultimate Go Tour</h1>
-            <p>Patch 36</p>
+            <p>Patch 37</p>
         </div>
         <div style="text-align: center">
-            <img
-                style="width: 100%; max-width: 3000px"
-                src="/tour/eng/static/img/ardan-labs-go-tour-banner.png"
-                alt="Take the Ultimate Go Tour!" />
+            <img style="width: 100%; max-width: 3000px" src="/tour/eng/static/img/ardan-labs-go-tour-banner.png" alt="Take the Ultimate Go Tour!" />
         </div>
         <div class="module" ng-repeat="m in toc.modules">
             <p id="{{m.id}}" class="module-title">{{m.title}}</p>
@@ -22,15 +19,10 @@ <h2>Ardan Labs</h2>
         <p>Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Ardan Labs</p>
         <ul>
             <li>
-                <a href="https://www.ardanlabs.com/training/" target="_blank"
-                    >Review our different courses and material</a
-                >
+                <a href="https://www.ardanlabs.com/training/" target="_blank">Review our different courses and material</a>
             </li>
         </ul>
-        <p>
-            Reach out about corporate training events, open enrollment live training sessions, and on-demand learning
-            options.
-        </p>
+        <p>Reach out about corporate training events, open enrollment live training sessions, and on-demand learning options.</p>
         <p>
             Ardan Labs (<a href="https://www.ardanlabs.com" target="_blank">www.ardanlabs.com</a>) -
             <a href="mailto:hello@ardanlabs.com" target="_blank">hello@ardanlabs.com</a>
diff --git a/_content/tour/eng/template/index.tmpl b/_content/tour/eng/template/index.tmpl
index 3082fdd1..faa39a70 100644
--- a/_content/tour/eng/template/index.tmpl
+++ b/_content/tour/eng/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/eng/script.js?p=36"></script>
+    <script src="/tour/eng/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/eng/welcome/sandbox.go b/_content/tour/eng/welcome/sandbox.go
index 183bb929..9525b562 100644
--- a/_content/tour/eng/welcome/sandbox.go
+++ b/_content/tour/eng/welcome/sandbox.go
@@ -1,3 +1,5 @@
+//go:build OMIT
+
 package main
 
 import (
diff --git a/_content/tour/fre/template/index.tmpl b/_content/tour/fre/template/index.tmpl
index db5bd599..97edf4ed 100644
--- a/_content/tour/fre/template/index.tmpl
+++ b/_content/tour/fre/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/fre/script.js?p=36"></script>
+    <script src="/tour/fre/script.js?p=37"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/_content/tour/ger/template/index.tmpl b/_content/tour/ger/template/index.tmpl
index 6a9a5f07..b7199291 100644
--- a/_content/tour/ger/template/index.tmpl
+++ b/_content/tour/ger/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/ger/script.js?p=36"></script>
+    <script src="/tour/ger/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/grc/template/index.tmpl b/_content/tour/grc/template/index.tmpl
index ea80a708..8869aa86 100644
--- a/_content/tour/grc/template/index.tmpl
+++ b/_content/tour/grc/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/grc/script.js?p=36"></script>
+    <script src="/tour/grc/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/ita/template/index.tmpl b/_content/tour/ita/template/index.tmpl
index 8c3feaf6..15116e15 100644
--- a/_content/tour/ita/template/index.tmpl
+++ b/_content/tour/ita/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/ita/script.js?p=36"></script>
+    <script src="/tour/ita/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/per/template/index.tmpl b/_content/tour/per/template/index.tmpl
index d30cbfda..709f27e1 100644
--- a/_content/tour/per/template/index.tmpl
+++ b/_content/tour/per/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/per/script.js?p=36"></script>
+    <script src="/tour/per/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/pol/template/index.tmpl b/_content/tour/pol/template/index.tmpl
index 59edf8c5..a01af670 100644
--- a/_content/tour/pol/template/index.tmpl
+++ b/_content/tour/pol/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/pol/script.js?p=36"></script>
+    <script src="/tour/pol/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/por/template/index.tmpl b/_content/tour/por/template/index.tmpl
index da707412..ca69bf0a 100644
--- a/_content/tour/por/template/index.tmpl
+++ b/_content/tour/por/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/por/script.js?p=36"></script>
+    <script src="/tour/por/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/rus/template/index.tmpl b/_content/tour/rus/template/index.tmpl
index 7552c16f..0197ca3c 100644
--- a/_content/tour/rus/template/index.tmpl
+++ b/_content/tour/rus/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/rus/script.js?p=36"></script>
+    <script src="/tour/rus/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/tur/template/index.tmpl b/_content/tour/tur/template/index.tmpl
index ff093b80..b5b34c11 100644
--- a/_content/tour/tur/template/index.tmpl
+++ b/_content/tour/tur/template/index.tmpl
@@ -102,7 +102,7 @@
 
     <div ng-view ng-cloak class="ng-cloak"></div>
 
-    <script src="/tour/tur/script.js?p=36"></script>
+    <script src="/tour/tur/script.js?p=37"></script>
 </body>
 
 </html>
diff --git a/_content/tour/eng/content_test.go b/content_test.go
similarity index 54%
rename from _content/tour/eng/content_test.go
rename to content_test.go
index 6c7b22d4..1e4dc6be 100644
--- a/_content/tour/eng/content_test.go
+++ b/content_test.go
@@ -2,51 +2,44 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package content
+package website
 
 import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
-
-	// Keep github.com/ardanlabs/gotour/external/tour/wc in our go.mod require list for use during test.
-	_ "github.com/ardanlabs/gotour/external/tour/wc"
 )
 
 // Test that all the .go files inside the content file build
 // and execute (without checking for output correctness).
-// Files that contain the string "// +build no-build" are not built.
-// Files that contain the string "// +build no-run" are not executed.
-func TestContent(t *testing.T) {
+// Files that contain the build constraint "nobuild" are not built.
+// Files that contain the build constraint "norun" are not executed.
+func TestContentEngTour(t *testing.T) {
 	if _, err := exec.LookPath("go"); err != nil {
 		t.Skipf("skipping because 'go' executable not available: %v", err)
 	}
 
-	scratch, err := ioutil.TempDir("", "tour-content-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(scratch)
+	err := filepath.Walk(filepath.Join("_content", "tour", "eng"), func(path string, fi os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
 
-	err = filepath.Walk(".", func(path string, fi os.FileInfo, err error) error {
 		if filepath.Ext(path) != ".go" {
 			return nil
 		}
-		if filepath.Base(path) == "content_test.go" {
-			return nil
-		}
+
 		t.Run(path, func(t *testing.T) {
 			t.Parallel()
-			if err := testSnippet(t, filepath.ToSlash(path), scratch); err != nil {
+			if err := testSnippet(filepath.ToSlash(path), t.TempDir()); err != nil {
 				t.Errorf("%v: %v", path, err)
 			}
 		})
+
 		return nil
 	})
 	if err != nil {
@@ -54,36 +47,41 @@ func TestContent(t *testing.T) {
 	}
 }
 
-func testSnippet(t *testing.T, path, scratch string) error {
-	b, err := ioutil.ReadFile(path)
+func testSnippet(path, scratch string) error {
+	b, err := os.ReadFile(path)
 	if err != nil {
 		return err
 	}
 
 	build := string(bytes.SplitN(b, []byte{'\n'}, 2)[0])
-	if !strings.HasPrefix(build, "// +build ") {
-		return errors.New("first line is not a +build comment")
+	if !strings.HasPrefix(build, "//go:build ") {
+		return errors.New("first line is not a go:build comment")
 	}
+
 	if !strings.Contains(build, "OMIT") {
-		return errors.New(`+build comment does not contain "OMIT"`)
+		return errors.New(`go:build comment does not contain "OMIT"`)
 	}
 
-	if strings.Contains(build, "no-build") {
+	if strings.Contains(build, "nobuild") {
 		return nil
 	}
+
 	bin := filepath.Join(scratch, filepath.Base(path)+".exe")
+
 	out, err := exec.Command("go", "build", "-o", bin, path).CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("build error: %v\noutput:\n%s", err, out)
 	}
 	defer os.Remove(bin)
 
-	if strings.Contains(build, "no-run") {
+	if strings.Contains(build, "norun") {
 		return nil
 	}
+
 	out, err = exec.Command(bin).CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("%v\nOutput:\n%s", err, out)
 	}
+
 	return nil
 }