Skip to content

Commit 9e52ac2

Browse files
committed
Merge branch 'master' into fix/grouping-config-idempotence
* master: (102 commits) fix(symbolicator): Tests are no longer allowed failures (#13566) fix(yarn): Fix yarn path in distutils (#13647) ref(ui): Remove OrganizationState from a bunch of places (#13646) ref(ui): Remove crufty global exports (#13578) feat(events-v2): Page loader improvements (#13645) fix: Query the right set of issues when given no set of envs for a given first release (#13551) feat(ui): update incidents icon (#13622) fix(ui): remove rate-limited values from graph when no events are present (#13624) feat(events-v2) Add a event graph to the event modal (#13568) fix(store): Check project.status is VISIBLE before attempting to process perf(snuba): Limit SnubaEvent.get_event to return the first result only. (#13644) tests(percy): Fix Incident status item dynamic time (#13640) ref(sentry10): Clean up action creators (#13636) ref(app-platform): Backfill IntegrationFeature table (#13548) ref(utils): Remove default / reexports from utils.jsx (#13581) feat(sentry10): Remove the ability to set a default environment (#13637) feat(api): Add url unfurls for incidents to slack integration (SEN-566) build(yarn): Upgrade yarn to 1.16.0, embed in repo (#13569) feat(api): Allow passing group_ids to `OrganizationGroupIndexEndpoint` for bulk fetching groups (SEN-701) feat(ui): Adds related issues to Incidents sidebar [SEN-695] (#13617) ...
2 parents 955b825 + 286145f commit 9e52ac2

File tree

426 files changed

+147978
-12112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+147978
-12112
lines changed

.travis.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ env:
3434
- DJANGO_VERSION=">=1.8,<1.9"
3535
# node's version is pinned by .nvmrc and is autodetected by `nvm install`.
3636
- NODE_DIR="${HOME}/.nvm/versions/node/v$(< .nvmrc)"
37-
- YARN_VERSION="1.13.0"
3837
- NODE_OPTIONS=--max-old-space-size=4096
3938

4039
script:
@@ -55,7 +54,7 @@ after_script:
5554
pip install codecov
5655
codecov -e TEST_SUITE
5756
fi
58-
- npm install -g @zeus-ci/cli
57+
- ./bin/yarn global add @zeus-ci/cli
5958
- zeus upload -t "text/xml+xunit" .artifacts/*junit.xml
6059
- zeus upload -t "text/xml+coverage" .artifacts/*coverage.xml
6160
- zeus upload -t "text/xml+coverage" .artifacts/coverage/cobertura-coverage.xml
@@ -90,7 +89,6 @@ base_acceptance: &acceptance_default
9089
before_install:
9190
- find "$NODE_DIR" -type d -empty -delete
9291
- nvm install
93-
- npm install -g "yarn@${YARN_VERSION}"
9492
- docker run -d --network host --name clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server:18.14.9
9593
- docker run -d --network host --name snuba --env SNUBA_SETTINGS=test --env CLICKHOUSE_SERVER=localhost:9000 getsentry/snuba
9694
- docker ps -a
@@ -117,10 +115,9 @@ matrix:
117115
name: 'Linter'
118116
env: TEST_SUITE=lint
119117
install:
118+
- SENTRY_LIGHT_BUILD=1 pip install -e ".[dev,tests,optional]"
120119
- find "$NODE_DIR" -type d -empty -delete
121120
- nvm install
122-
- npm install -g "yarn@${YARN_VERSION}"
123-
- pip install -r requirements-dev.txt
124121
- yarn install --pure-lockfile
125122

126123
- <<: *postgres_default
@@ -158,7 +155,6 @@ matrix:
158155
before_install:
159156
- find "$NODE_DIR" -type d -empty -delete
160157
- nvm install
161-
- npm install -g "yarn@${YARN_VERSION}"
162158
install:
163159
- yarn install --pure-lockfile
164160

@@ -180,7 +176,6 @@ matrix:
180176
before_install:
181177
- find "$NODE_DIR" -type d -empty -delete
182178
- nvm install
183-
- npm install -g "yarn@${YARN_VERSION}"
184179

185180
- <<: *postgres_default
186181
name: 'Symbolicator Integration'
@@ -225,7 +220,6 @@ matrix:
225220
- tar -xzf credentials.tar.gz
226221
# Use the decrypted service account credentials to authenticate the command line tool
227222
- gcloud auth activate-service-account --key-file client-secret.json
228-
- npm install -g "yarn@${YARN_VERSION}"
229223
install:
230224
- yarn install --pure-lockfile
231225
- gcloud version
@@ -239,12 +233,6 @@ matrix:
239233
- language: node_js
240234
env: STORYBOOK_BUILD=1
241235

242-
# XXX(ja): Should be removed once symbolicator's interface is more stable or
243-
# tests have been refactored to be more lenient. At the moment, snapshots
244-
# break every time when a new attribute is added or some secondary attribute
245-
# is changed.
246-
- env: TEST_SUITE=symbolicator
247-
248236
notifications:
249237
webhooks:
250238
urls:

.travis/deploy-storybook.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BRANCH_PROCESSED=$(echo "${DEPLOY_BRANCH}" | tr '[:upper:]./' '[:lower:]--' | tr
1010
BUCKET_DIR_NAME="branches/${BRANCH_PROCESSED}"
1111
echo "Bucket directory: ${BUCKET_DIR_NAME}"
1212

13-
npm run storybook-build
13+
./bin/yarn run storybook-build
1414

1515
# Upload the files
1616
gsutil cp .storybook-out/favicon.ico "gs://${GS_BUCKET_NAME}/favicon.ico"

.yarnrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
yarn-path "./bin/yarn"
2+
disable-self-update-check true

Makefile

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,21 @@ ifneq "$(wildcard /usr/local/opt/openssl/lib)" ""
88
endif
99

1010
PIP = LDFLAGS="$(LDFLAGS)" pip
11-
WEBPACK = NODE_ENV=production ./node_modules/.bin/webpack
12-
YARN_VERSION = 1.13.0
11+
WEBPACK = NODE_ENV=production ./bin/yarn webpack
12+
YARN = ./bin/yarn
1313

14-
bootstrap: install-system-pkgs develop create-db apply-migrations
14+
bootstrap: install-system-pkgs develop init-config run-dependent-services create-db apply-migrations
1515

1616
develop: setup-git ensure-venv develop-only
1717

1818
develop-only: update-submodules install-yarn-pkgs install-sentry-dev
1919

20+
init-config:
21+
sentry init --dev
22+
23+
run-dependent-services:
24+
sentry devservices up
25+
2026
test: develop lint test-js test-python test-cli
2127

2228
ensure-venv:
@@ -70,19 +76,17 @@ node-version-check:
7076
install-system-pkgs: node-version-check
7177
@echo "--> Installing system packages (from Brewfile)"
7278
@command -v brew 2>&1 > /dev/null && brew bundle || (echo 'WARNING: homebrew not found or brew bundle failed - skipping system dependencies.')
73-
@echo "--> Installing yarn $(YARN_VERSION) (via npm)"
74-
@$(volta --version 2>&1 > /dev/null || npm install -g "yarn@$(YARN_VERSION)")
7579

7680
install-yarn-pkgs:
7781
@echo "--> Installing Yarn packages (for development)"
78-
@command -v yarn 2>&1 > /dev/null || (echo 'yarn not found. Please install it before proceeding.'; exit 1)
82+
@command -v $(YARN) 2>&1 > /dev/null || (echo 'yarn not found. Please install it before proceeding.'; exit 1)
7983
# Use NODE_ENV=development so that yarn installs both dependencies + devDependencies
80-
NODE_ENV=development yarn install --pure-lockfile
84+
NODE_ENV=development $(YARN) install --pure-lockfile
8185
# A common problem is with node packages not existing in `node_modules` even though `yarn install`
8286
# says everything is up to date. Even though `yarn install` is run already, it doesn't take into
8387
# account the state of the current filesystem (it only checks .yarn-integrity).
8488
# Add an additional check against `node_modules`
85-
yarn check --verify-tree || yarn install --check-files
89+
$(YARN) check --verify-tree || $(YARN) install --check-files
8690

8791
install-sentry-dev:
8892
@echo "--> Installing Sentry (for development)"
@@ -129,13 +133,13 @@ test-js: node-version-check
129133
@echo "--> Building static assets"
130134
@$(WEBPACK) --profile --json > .artifacts/webpack-stats.json
131135
@echo "--> Running JavaScript tests"
132-
@npm run test-ci
136+
@$(YARN) run test-ci
133137
@echo ""
134138

135139
# builds and creates percy snapshots
136140
test-styleguide:
137141
@echo "--> Building and snapshotting styleguide"
138-
@npm run snapshot
142+
@$(YARN) run snapshot
139143
@echo ""
140144

141145
test-python:
@@ -244,12 +248,12 @@ scan-python:
244248
bin/scan
245249
@echo ""
246250

247-
travis-scan-postgres: scan-python
251+
travis-scan-postgres: travis-noop
248252
travis-scan-acceptance: travis-noop
249-
travis-scan-snuba: scan-python
253+
travis-scan-snuba: travis-noop
250254
travis-scan-symbolicator: travis-noop
251255
travis-scan-js: travis-noop
252256
travis-scan-cli: travis-noop
253257
travis-scan-dist: travis-noop
254-
travis-scan-lint: travis-noop
255-
travis-scan-riak: scan-python
258+
travis-scan-lint: scan-python
259+
travis-scan-riak: travis-noop

api-docs/generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ def dump_markdown(path, data):
282282
pass
283283
with open(path, 'w') as f:
284284
template = u"""---
285-
# This file is automatically generated from the API using `api-docs/generate.py`
286-
# Do not manually this file.
285+
# This file is automatically generated from the API using `sentry/api-docs/generator.py.`
286+
# Do not manually edit this file.
287287
{}
288288
---
289289
"""

babel.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ module.exports = {
1818
env: {
1919
production: {},
2020
development: {
21-
plugins: [['emotion', {sourceMap: true, autoLabel: true}]],
21+
plugins: [
22+
['emotion', {sourceMap: true, autoLabel: true}],
23+
'@babel/plugin-transform-react-jsx-source',
24+
],
2225
},
2326
test: {
2427
plugins: [['emotion', {autoLabel: true}], 'dynamic-import-node'],

0 commit comments

Comments
 (0)