diff --git a/.github/workflows/functional_tests.yaml b/.github/workflows/functional_tests.yaml index b7035b9ed7..4d0f270fb7 100644 --- 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 index 7a71a4a7cc..efccc49c81 100644 --- 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 index b2715135cd..6beef21176 100644 --- 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 index dd228296eb..d6f4237890 100644 --- 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 index 645a5427e1..d70bd5c3f5 100644 --- 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 index d6d2de9df0..d2bdece29f 100644 --- 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 index 21f6aff4b7..011c851cd2 100644 --- 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);