From cc359a2e625d3d426813c978352e3f406d434173 Mon Sep 17 00:00:00 2001 From: Giorgio Azzinnaro Date: Fri, 3 Jan 2025 17:07:15 +0100 Subject: [PATCH] ci: attempt at sentry without +1 --- .github/workflows/build.yaml | 2 +- ios/ci_scripts/ci_post_xcodebuild.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5176bc0..e84dbbb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -117,6 +117,6 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} # The +1 is explicitly provided for consistency with the Xcode Cloud build: since we set SENTRY_DIST below, # Sentry will automatically pick that as build number anyway. - SENTRY_RELEASE: "is.giorgio.app.parousia@${{ steps.parse_pubspec.outputs.pubspec_version }}+1" + SENTRY_RELEASE: "is.giorgio.app.parousia@${{ steps.parse_pubspec.outputs.pubspec_version }}" SENTRY_DIST: ${{ github.run_number }} run: dart run sentry_dart_plugin diff --git a/ios/ci_scripts/ci_post_xcodebuild.sh b/ios/ci_scripts/ci_post_xcodebuild.sh index b34b289..1c18c85 100755 --- a/ios/ci_scripts/ci_post_xcodebuild.sh +++ b/ios/ci_scripts/ci_post_xcodebuild.sh @@ -10,10 +10,10 @@ cd "$CI_PRIMARY_REPOSITORY_PATH" # change working directory to the root of your export PATH="$PATH:$HOME/flutter/bin" # We need a common release name for Sentry. -# This command gets the version from the pubspec.yaml file - including the +1 build number. -# Since we set SENTRY_DIST below, Sentry will actually use that as the build number. +# This command gets the version from the pubspec.yaml file - without the +1 part. +# SENTRY_DIST below will be the CI_BUILD_NUMBER. # This grep command is different from the one in GitHub Actions because here we are on macOS. -SENTRY_RELEASE="is.giorgio.app.parousia@$(grep '^version:' pubspec.yaml | awk '{print $2}')" +SENTRY_RELEASE="is.giorgio.app.parousia@$(grep '^version:' pubspec.yaml | awk -F'[ +]' '{print $2}')" export SENTRY_RELEASE # https://docs.sentry.io/platforms/flutter/configuration/options/#dist