Skip to content

Commit

Permalink
fix peerDeps, add current branch for testing, removed sentry/cli, add…
Browse files Browse the repository at this point in the history
…ed current branch for testing
  • Loading branch information
lucas-zimerman committed Dec 18, 2023
1 parent ac80e23 commit 9ef92ed
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 21 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/update-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
push:
branches:
- main
# Temporary for testing.
- feat/auto-bump=dep

jobs:
android:
Expand Down Expand Up @@ -46,12 +48,3 @@ jobs:
changelog-entry: false
secrets:
api-token: ${{ secrets.CI_DEPLOY_KEY }}

cli:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
with:
path: scripts/update-cli.sh
name: CLI
pr-strategy: update
secrets:
api-token: ${{ secrets.CI_DEPLOY_KEY }}
8 changes: 0 additions & 8 deletions scripts/update-cli.sh

This file was deleted.

7 changes: 4 additions & 3 deletions scripts/update-javascript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ set -euo pipefail

tagPrefix=''
repo="https://github.com/getsentry/sentry-javascript.git"
packages=('@sentry/browser' '@sentry/core' '@sentry/integrations' '@sentry/react' '@sentry/vue' '@sentry/angular' '@sentry/angular-ivy' '@sentry/types' '@sentry/utils')
packages=('@sentry/browser' '@sentry/core' '@sentry/integrations' '@sentry/types' '@sentry/utils')
#TODO: remove @sentry/hub and @sentry/tracing on next major release.
#https://github.com/getsentry/sentry-capacitor/issues/511
package+=('@sentry/hub' '@sentry/tracing')
packages+=('@sentry/hub' '@sentry/tracing')
packages+=('@sentry-internal/eslint-config-sdk' '@sentry-internal/eslint-plugin-sdk' '@sentry-internal/typescript')

peerPackages=('@sentry/react' '@sentry/vue' '@sentry/angular' '@sentry/angular-ivy')
. $(dirname "$0")/update-package-json.sh
. $(dirname "$0")/update-peer-package-json.sh
7 changes: 6 additions & 1 deletion scripts/update-package-json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ set-version)
done
(
cd "$(dirname "$file")"
yarn upgrade --non-interactive $list
if [ "$update-peer-packages" = true]; then
#upgrade doesn't support peerDependencies so we'll use the yarn option.
yarn add --peer $list --update-sentry-capacitor
else
yarn upgrade --non-interactive $list --update-sentry-capacitor
fi
)
;;
*)
Expand Down

0 comments on commit 9ef92ed

Please sign in to comment.