Skip to content

Commit 14e30a3

Browse files
authored
Merge pull request #6036 from opengisch/partial_sentry_disable
Disable sentry on system where it's inactive
2 parents 5464b0c + f36e47f commit 14e30a3

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.github/workflows/linux.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ jobs:
7474
-D ENABLE_TESTS=ON \
7575
-D NUGET_USERNAME=opengisch \
7676
-D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }} \
77-
-D SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
78-
-D SENTRY_ENV="${APP_ENV}" \
7977
-D CMAKE_INSTALL_PREFIX=/usr \
8078
-D CMAKE_EXPORT_COMPILE_COMMANDS=ON \
8179
-D CMAKE_COMPILE_WARNING_AS_ERROR=ON \
8280
-D LINUXDEPLOY_EXECUTABLE=${{ env.BUILD_ROOT }}/linuxdeploy-x86_64.AppImage
81+
# -D SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
82+
# -D SENTRY_ENV="${APP_ENV}" \
8383
8484
- name: 📑 Upload dep build logs
8585
uses: actions/upload-artifact@v4
@@ -171,14 +171,14 @@ jobs:
171171
asset_name: ${{ env.ARTIFACT_NAME }}
172172
overwrite: true
173173

174-
- name: 📮 Upload debug symbols
175-
if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') && env.ARTIFACT_NAME != null
176-
env:
177-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
178-
SENTRY_ORG_SLUG: opengisch
179-
SENTRY_PROJECT_SLUG: qfield
180-
run: |
181-
bundle exec fastlane run sentry_debug_files_upload path:build
174+
# - name: 📮 Upload debug symbols
175+
# if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') && env.ARTIFACT_NAME != null
176+
# env:
177+
# SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
178+
# SENTRY_ORG_SLUG: opengisch
179+
# SENTRY_PROJECT_SLUG: qfield
180+
# run: |
181+
# bundle exec fastlane run sentry_debug_files_upload path:build
182182

183183
- name: Perform CodeQL Analysis
184184
uses: github/codeql-action/analyze@v3

.github/workflows/windows.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ jobs:
8686
-D ENABLE_TESTS=ON \
8787
-D NUGET_USERNAME=opengisch \
8888
-D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }} \
89-
-D SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
90-
-D SENTRY_ENV="${APP_ENV}" \
9189
-D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded\$<\$<CONFIG:Debug>:Debug>" \
9290
-D PKG_CONFIG_EXECUTABLE=${CMAKE_BUILD_DIR}/vcpkg_installed/x64-windows-static/tools/pkgconf/pkgconf.exe \
9391
-D WITH_BLUETOOTH=ON \
9492
-D VCPKG_INSTALL_OPTIONS="--x-buildtrees-root=C:/src" \
9593
-D CMAKE_COMPILE_WARNING_AS_ERROR=ON \
9694
${EXTRA_CMAKE_ARGS}
95+
# -D SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
96+
# -D SENTRY_ENV="${APP_ENV}" \
9797

9898
- name: 📑 Upload dep build logs
9999
uses: actions/upload-artifact@v4
@@ -198,14 +198,14 @@ jobs:
198198
run: |
199199
bundle exec fastlane windows upload_s3 exe:${{ env.ARTIFACT_PATHNAME }}
200200
201-
- name: 📮 Upload debug symbols
202-
if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') && env.ARTIFACT_NAME != null
203-
env:
204-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
205-
SENTRY_ORG_SLUG: opengisch
206-
SENTRY_PROJECT_SLUG: qfield
207-
run: |
208-
bundle exec fastlane run sentry_debug_files_upload path:${{ env.CMAKE_BUILD_DIR }}
201+
# - name: 📮 Upload debug symbols
202+
# if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') && env.ARTIFACT_NAME != null
203+
# env:
204+
# SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
205+
# SENTRY_ORG_SLUG: opengisch
206+
# SENTRY_PROJECT_SLUG: qfield
207+
# run: |
208+
# bundle exec fastlane run sentry_debug_files_upload path:${{ env.CMAKE_BUILD_DIR }}
209209

210210
deploy:
211211
name: deploy (ms store)

0 commit comments

Comments
 (0)