WIP: Fix submodules?

mozilla-mobile · Nov 17, 2022 · 46dd859 · 46dd859
1 parent 60e95ce
commit 46dd859
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 49 deletions.
diff --git a/.github/workflows/functional_tests.yaml b/.github/workflows/functional_tests.yaml
@@ -23,13 +23,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with: 
+          submodules: 'true'
       - name: Install dependecies
         if: steps.cache-build.outputs.cache-hit != 'true'
         run: |

diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -22,13 +22,8 @@ jobs:
 
       - name: Clone repository
         uses: actions/checkout@v3
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with: 
+          submodules: 'true'
 
       - name: Set up Python 3
         uses: actions/setup-python@v3

diff --git a/.github/workflows/test_unit.yaml b/.github/workflows/test_unit.yaml
@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
+        with: 
+          submodules: 'true'
 
       - name: Install dependences
         run: |
@@ -32,13 +34,6 @@ jobs:
           python3 -m pip install aqtinstall
           aqt install-qt --outputdir /opt linux desktop $QTVERSION gcc_64 -m all
 
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
       - name: Cache grcov
         id: cache-grcov
         uses: actions/cache@v3
@@ -96,14 +91,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
+        with: 
+          submodules: 'true'
       - name: Install python dependencies
         shell: bash
         run: |
@@ -177,13 +166,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with: 
+          submodules: 'true'
 
       - name: Install Qt
         shell: bash

diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml
@@ -26,13 +26,8 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with: 
+            submodules: 'true'
 
       - name: Install Qt
         shell: bash

diff --git a/src/featureslist.h b/src/featureslist.h
@@ -243,8 +243,8 @@ FEATURE_SIMPLE(gleanRust,             // Feature ID
 
 FEATURE_SIMPLE(sentry,                     // Feature ID
                "Sentry Crash Report SDK",  // Feature name
-               "2.13.0",                   // released
-               FeatureCallback_false,      // Can be flipped on
-               FeatureCallback_false,      // Can be flipped off
+               "2.12.0",                   // released
+               FeatureCallback_true,       // Can be flipped on
+               FeatureCallback_true,       // Can be flipped off
                QStringList(),              // feature dependencies
                FeatureCallback_inStaging)
diff --git a/src/mozillavpn.cpp b/src/mozillavpn.cpp
@@ -46,7 +46,7 @@
 #include "websocket/websockethandler.h"
 
 #ifdef SENTRY_ENABLED
-  #include "sentry/sentryadapter.h"
+#  include "sentry/sentryadapter.h"
 #endif
 
 #ifdef MVPN_IOS

diff --git a/src/networkrequest.h b/src/networkrequest.h
@@ -137,9 +137,9 @@ class NetworkRequest final : public QObject {
 
   static NetworkRequest* createForFxaSessionDestroy(
       Task* parent, const QByteArray& sessionToken);
-  
+
   static NetworkRequest* createForSentry(Task* parent,
-                                        const QByteArray& envelope);
+                                         const QByteArray& envelope);
 
   static NetworkRequest* createForProducts(Task* parent);