Skip to content

Commit

Permalink
Merge branch 'develop' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
c298lee authored Sep 17, 2024
2 parents 0ee7529 + e31fd63 commit 69f8035
Show file tree
Hide file tree
Showing 987 changed files with 23,145 additions and 8,477 deletions.
10 changes: 10 additions & 0 deletions .craft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ targets:
- name: npm
id: '@sentry/vercel-edge'
includeNames: /^sentry-vercel-edge-\d.*\.tgz$/
- name: npm
id: '@sentry/cloudflare'
includeNames: /^sentry-cloudflare-\d.*\.tgz$/
- name: npm
id: '@sentry/deno'
includeNames: /^sentry-deno-\d.*\.tgz$/
Expand Down Expand Up @@ -111,6 +114,9 @@ targets:
- name: npm
id: '@sentry/remix'
includeNames: /^sentry-remix-\d.*\.tgz$/
- name: npm
id: '@sentry/solidstart'
includeNames: /^sentry-solidstart-\d.*\.tgz$/
- name: npm
id: '@sentry/sveltekit'
includeNames: /^sentry-sveltekit-\d.*\.tgz$/
Expand Down Expand Up @@ -180,6 +186,8 @@ targets:
format: base64
'npm:@sentry/bun':
onlyIfPresent: /^sentry-bun-\d.*\.tgz$/
'npm:@sentry/cloudflare':
onlyIfPresent: /^sentry-cloudflare-\d.*\.tgz$/
'npm:@sentry/deno':
onlyIfPresent: /^sentry-deno-\d.*\.tgz$/
'npm:@sentry/ember':
Expand All @@ -198,6 +206,8 @@ targets:
onlyIfPresent: /^sentry-remix-\d.*\.tgz$/
'npm:@sentry/solid':
onlyIfPresent: /^sentry-solid-\d.*\.tgz$/
'npm:@sentry/solidstart':
onlyIfPresent: /^sentry-solidstart-\d.*\.tgz$/
'npm:@sentry/svelte':
onlyIfPresent: /^sentry-svelte-\d.*\.tgz$/
'npm:@sentry/sveltekit':
Expand Down
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🐞 Bug Report
description: Tell us about something that's not working the way we (probably) intend.
labels: ['Type: Bug']
type: 'bug'
body:
- type: checkboxes
attributes:
Expand Down Expand Up @@ -31,20 +31,23 @@ body:
setup.
options:
- '@sentry/browser'
- '@sentry/astro'
- '@sentry/node'
- '@sentry/angular'
- '@sentry/astro'
- '@sentry/aws-serverless'
- '@sentry/bun'
- '@sentry/cloudflare'
- '@sentry/deno'
- '@sentry/ember'
- '@sentry/gatsby'
- '@sentry/google-cloud-serverless'
- '@sentry/nestjs'
- '@sentry/nextjs'
- '@sentry/node'
- '@sentry/nuxt'
- '@sentry/react'
- '@sentry/remix'
- '@sentry/solid'
- '@sentry/solidstart'
- '@sentry/svelte'
- '@sentry/sveltekit'
- '@sentry/vue'
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 💡 Feature Request
description: Create a feature request for a sentry-javascript SDK.
labels: ['Type: Improvement']
type: 'enhancement'
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/flaky.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: ❅ Flaky Test
description: Report a flaky test in CI
title: '[Flaky CI]: '
type: 'task'
labels: ['Type: Tests']
body:
- type: dropdown
Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/internal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: 💡 [Internal] Blank Issue
description: Only for Sentry Employees! Create an issue without a template.
type: 'task'
body:
- type: markdown
attributes:
value: Make sure to apply relevant labels and issue types before submitting.
- type: textarea
id: description
attributes:
Expand Down
27 changes: 27 additions & 0 deletions .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Install yarn dependencies"
description: "Installs yarn dependencies and caches them."

outputs:
cache_key:
description: "The dependency cache key"
value: ${{ steps.compute_lockfile_hash.outputs.hash }}

runs:
using: "composite"
steps:
- name: Compute dependency cache key
id: compute_lockfile_hash
run: node ./scripts/dependency-hash-key.js >> "$GITHUB_OUTPUT"
shell: bash

- name: Check dependency cache
uses: actions/cache@v4
id: cache_dependencies
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ steps.compute_lockfile_hash.outputs.hash }}

- name: Install dependencies
if: steps.cache_dependencies.outputs.cache-hit != 'true'
run: yarn install --ignore-engines --frozen-lockfile
shell: bash
42 changes: 42 additions & 0 deletions .github/actions/install-playwright/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "Install Playwright dependencies"
description: "Installs Playwright dependencies and caches them."
inputs:
browsers:
description: 'What browsers to install.'
default: 'chromium webkit firefox'

runs:
using: "composite"
steps:
- name: Get Playwright version
id: playwright-version
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
shell: bash

- name: Restore cached playwright binaries
uses: actions/cache/restore@v4
id: playwright-cache
with:
path: |
~/.cache/ms-playwright
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}

# We always install all browsers, if uncached
- name: Install Playwright dependencies (uncached)
run: npx playwright install chromium webkit firefox --with-deps
if: steps.playwright-cache.outputs.cache-hit != 'true'
shell: bash

- name: Install Playwright system dependencies only (cached)
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
if: steps.playwright-cache.outputs.cache-hit == 'true'
shell: bash

# Only store cache on develop branch
- name: Store cached playwright binaries
uses: actions/cache/save@v4
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
with:
path: |
~/.cache/ms-playwright
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
37 changes: 27 additions & 10 deletions .github/actions/restore-cache/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: "Restore dependency & build cache"
description: "Restore the dependency & build cache."

inputs:
dependency_cache_key:
description: "The dependency cache key"
required: true
node_version:
description: "If set, temporarily set node version to default one before installing, then revert to this version after."
required: false

runs:
using: "composite"
steps:
Expand All @@ -9,17 +17,26 @@ runs:
uses: actions/cache/restore@v4
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ env.DEPENDENCY_CACHE_KEY }}
key: ${{ inputs.dependency_cache_key }}

- name: Check build cache
uses: actions/cache/restore@v4
id: build-cache
- name: Restore build artifacts
uses: actions/download-artifact@v4
with:
path: ${{ env.CACHED_BUILD_PATHS }}
key: ${{ env.BUILD_CACHE_KEY }}
name: build-output

- name: Use default node version for install
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'

- name: Install dependencies
if: steps.dep-cache.outputs.cache-hit != 'true'
run: yarn install --ignore-engines --frozen-lockfile
shell: bash

- name: Check if caches are restored
uses: actions/github-script@v6
if: steps.dep-cache.outputs.cache-hit != 'true' || steps.build-cache.outputs.cache-hit != 'true'
- name: Revert node version to ${{ inputs.node_version }}
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
uses: actions/setup-node@v4
with:
script: core.setFailed('Dependency or build cache could not be restored - please re-run ALL jobs.')
node-version: ${{ inputs.node_version }}
4 changes: 3 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ updates:
allow:
- dependency-name: "@sentry/cli"
- dependency-name: "@sentry/vite-plugin"
- dependency-name: "@sentry/webpack-plugin"
- dependency-name: "@sentry/rollup-plugin"
- dependency-name: "@sentry/esbuild-plugin"
- dependency-name: "@opentelemetry/*"
- dependency-name: "@prisma/instrumentation"
- dependency-name: "opentelemetry-instrumentation-fetch-node"
versioning-strategy: increase
commit-message:
prefix: feat
Expand Down
Loading

0 comments on commit 69f8035

Please sign in to comment.