Merge branch 'master' into feat/span-first-2

Author: sentrivana

.craft.yml

@@ -1,4 +1,5 @@
-minVersion: 2.17.0
+minVersion: 2.21.1
+preReleaseCommand: bash scripts/bump-version.sh
 targets:
   - name: pypi
     includeNames: /^sentry[_\-]sdk.*$/
@@ -30,5 +31,12 @@ targets:
     license: MIT
   - name: sentry-pypi
     internalPypiRepo: getsentry/pypi
-changelog: CHANGELOG.md
-changelogPolicy: auto
+artifactProvider:
+  name: github
+  config:
+    artifacts:
+      CI:
+        - 'artifact-*'
+changelog:
+  filePath: CHANGELOG.md
+  policy: auto

.github/release.yml

@@ -5,33 +5,37 @@ changelog:
     authors:
       - dependabot
   categories:
+    - title: Breaking Changes 🛠
+      commit_patterns:
+        - "^(?<type>\\w+(?:\\((?<scope>[^)]+)\\))?!:\\s*)"
+      semver: major
     - title: New Features ✨
       labels:
         - "Changelog: Feature"
       commit_patterns:
-        - "^feat\\b"
+        - "^(?<type>feat(?:\\((?<scope>[^)]+)\\))?!?:\\s*)"
       semver: minor
     - title: Bug Fixes 🐛
       labels:
         - "Changelog: Bugfix"
       commit_patterns:
-        - "^(fix|bugfix)\\b"
+        - "^(?<type>(?:fix|bugfix)(?:\\((?<scope>[^)]+)\\))?!?:\\s*)"
       semver: patch
     - title: Deprecations 🏗️
       labels:
         - "Changelog: Deprecation"
       commit_patterns:
-        - "deprecat"  # deprecation, deprecated
+        - "^(?<type>deprecat(?:ion|ed|e)(?:\\((?<scope>[^)]+)\\))?!?:?\\s*)"
       semver: patch
     - title: Documentation 📚
       labels:
         - "Changelog: Docs"
       commit_patterns:
-        - "^docs?\\b"
+        - "^(?<type>docs?(?:\\((?<scope>[^)]+)\\))?!?:\\s*)"
       semver: patch
     - title: Internal Changes 🔧
       labels:
         - "Changelog: Internal"
       commit_patterns:
-        - "^(build|ref|chore|ci|tests?)\\b"
+        - "^(?<type>(?:build|refactor|meta|chore|ci|ref|perf|tests?)(?:\\((?<scope>[^)]+)\\))?!?:\\s*)"
       semver: patch

.github/workflows/ci.yml

@@ -61,8 +61,6 @@ jobs:
           path: |
             dist/*
           if-no-files-found: 'error'
-          # since this artifact will be merged, compression is not necessary
-          compression-level: '0'
 
   docs:
     name: Build SDK API Doc
@@ -85,17 +83,3 @@ jobs:
           path: |
             docs/_build/gh-pages.zip
           if-no-files-found: 'error'
-          # since this artifact will be merged, compression is not necessary
-          compression-level: '0'
-
-  merge:
-    name: Create Release Artifact
-    runs-on: ubuntu-latest
-    needs: [build_lambda_layer, docs]
-    steps:
-      - uses: actions/upload-artifact/merge@v6
-        with:
-          # Craft expects release assets from github to be a single artifact named after the sha.
-          name: ${{ github.sha }}
-          pattern: artifact-*
-          delete-merged: true

scripts/bump-version.sh

@@ -9,18 +9,15 @@ fi
 SCRIPT_DIR="$( dirname "$0" )"
 cd $SCRIPT_DIR/..
 
-OLD_VERSION="${1}"
-NEW_VERSION="${2}"
-
-echo "Current version: $OLD_VERSION"
-echo "Bumping version: $NEW_VERSION"
+echo "Current version: $CRAFT_OLD_VERSION"
+echo "Bumping version: $CRAFT_NEW_VERSION"
 
 function replace() {
     ! grep "$2" $3
     perl -i -pe "s/$1/$2/g" $3
     grep "$2" $3  # verify that replacement was successful
 }
 
-replace "version=\"$OLD_VERSION\"" "version=\"$NEW_VERSION\"" ./setup.py
-replace "VERSION = \"$OLD_VERSION\"" "VERSION = \"$NEW_VERSION\"" ./sentry_sdk/consts.py
-replace "release = \"$OLD_VERSION\"" "release = \"$NEW_VERSION\"" ./docs/conf.py
+replace "version=\"$CRAFT_OLD_VERSION\"" "version=\"$CRAFT_NEW_VERSION\"" ./setup.py
+replace "VERSION = \"$CRAFT_OLD_VERSION\"" "VERSION = \"$CRAFT_NEW_VERSION\"" ./sentry_sdk/consts.py
+replace "release = \"$CRAFT_OLD_VERSION\"" "release = \"$CRAFT_NEW_VERSION\"" ./docs/conf.py