feat(docs): update google analytics to gtag + publish to s3 (#727)

* Old google analytics was changed to gtag * publish to s3 Co-authored-by: Sergei Iartsev Co-authored-by: Anton Malinskiy <[email protected]>
MarathonLabs · Jan 9, 2023 · 4f7f11d · 4f7f11d
1 parent 4990fe0
commit 4f7f11d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 32 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,27 @@
+name: Build and deploy docs
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  github-pages:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: helaili/[email protected]
+        with:
+          jekyll_src: docs
+          gem_src: docs
+          build_dir: docs_build_dir
+          build_only: true
+      - uses: jakejarvis/s3-sync-action@master
+        with:
+          args: --follow-symlinks --delete
+        env:
+          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'eu-central-1'
+          SOURCE_DIR: 'docs/docs_build_dir'
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -6,7 +6,7 @@ subtitle: 'Cross-platform test runner for Android and iOS'
 # disqus_shortname: ''
 
 # if you use google analytics, add your tracking id here
-google_analytics_id: 'UA-131132823-2'
+google_analytics_id: 'G-7RE7PPY2QW'
 
 # Enable/show navigation. There are there options:
 #   0 - always hide
@@ -30,7 +30,7 @@ sections: [
 
 # Keep as an empty string if served up at the root. If served up at a specific
 # path (e.g. on GitHub pages) leave off the trailing slash, e.g. /my-project
-baseurl: '/marathon'
+baseurl: ''
 
 # Dates are not included in permalinks
 permalink: none

diff --git a/docs/_data/commons.yaml b/docs/_data/commons.yaml
@@ -1,4 +1,4 @@
 name: "Marathon"
-google_analytics: "UA-131132823-2"
+google_analytics: "G-7RE7PPY2QW"
 description: "Cross-platform test runner written for Android and iOS projects"
 keywords: "android, testing, testing-tool, test-runner, espresso, uitest, uitesting, uitests, ios, marathon, xcrun, instrumentation, instrumentation-tests, gradle, parallel, performance"
diff --git a/docs/_includes/_google-analytics.html b/docs/_includes/_google-analytics.html
@@ -1,13 +1,13 @@
+<script
+  async
+  src="https://www.googletagmanager.com/gtag/js?id={{ site.data.commons.google_analytics }}"
+></script>
 <script>
-    (function (i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
-            (i[r].q = i[r].q || []).push(arguments)
-        }, i[r].l = 1 * new Date(); a = s.createElement(o),
-            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-
-    ga('create', '{{ site.data.commons.google_analytics }}', 'auto');
-    ga('send', 'pageview');
-
+  window.dataLayer = window.dataLayer || [];
+  function gtag() {
+    dataLayer.push(arguments);
+  }
+  gtag("js", new Date());
 
+  gtag("config", "{{ site.data.commons.google_analytics }}");
 </script>