From 3cb6f3a094a98e217b2f9f66c9ea80520b060269 Mon Sep 17 00:00:00 2001 From: alves Date: Mon, 15 Dec 2025 16:09:32 +0800 Subject: [PATCH] feature merge the sentry mac and win on the sentry server --- .github/workflows/build_deps.yml | 30 ++++++++++++++-------------- src/sentry_wrapper/SentryWrapper.cpp | 8 +++----- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 1a31b91e49..b3d065236a 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -115,7 +115,7 @@ jobs: tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir - # Upload Artifacts + # Upload Artifacts (commented out to reduce artifact storage usage) # - name: Upload Mac ${{ inputs.arch }} artifacts # if: inputs.os == 'macos-14' # uses: actions/upload-artifact@v4 @@ -123,21 +123,21 @@ jobs: # name: OrcaSlicer_dep_mac_${{ env.date }} # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz - - name: Upload Windows artifacts - if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v4 - with: - name: OrcaSlicer_dep_win64_${{ env.date }} - path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip + # - name: Upload Windows artifacts + # if: inputs.os == 'windows-latest' + # uses: actions/upload-artifact@v4 + # with: + # name: OrcaSlicer_dep_win64_${{ env.date }} + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip - - name: Upload Ubuntu artifacts - if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} - env: - ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - uses: actions/upload-artifact@v4 - with: - name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} - path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz + # - name: Upload Ubuntu artifacts + # if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} + # env: + # ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} + # uses: actions/upload-artifact@v4 + # with: + # name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz build_orca: name: Build Snapmaker_Orca diff --git a/src/sentry_wrapper/SentryWrapper.cpp b/src/sentry_wrapper/SentryWrapper.cpp index 316f56cce5..3dfcb60712 100644 --- a/src/sentry_wrapper/SentryWrapper.cpp +++ b/src/sentry_wrapper/SentryWrapper.cpp @@ -111,14 +111,12 @@ static sentry_value_t before_send(sentry_value_t event, void* hint, void* data) void initSentryEx() { sentry_options_t* options = sentry_options_new(); - std::string dsn = ""; + std::string dsn = std::string("https://c74b617c2aedc291444d3a238d23e780@o4508125599563776.ingest.us.sentry.io/4510425163956224"); { -#ifdef __APPLE__ - - std::string dsn = std::string("https://ac473187efb8877f36bd31694ffd5dec@o4508125599563776.ingest.us.sentry.io/4510425212059648"); +#ifdef __APPLE__ #elif _WIN32 - std::string dsn = std::string("https://c74b617c2aedc291444d3a238d23e780@o4508125599563776.ingest.us.sentry.io/4510425163956224"); + #endif sentry_options_set_dsn(options, dsn.c_str()); std::string handlerDir = "";