Skip to content

Commit b060a43

Browse files
authored
fix: sentry integration test should no longer expect yarn (#196)
1 parent d219c7b commit b060a43

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

.github/workflows/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
bootstrap-macos-13:
4343
# This job takes half an hour and costs a lot of money.
4444
# Let's just run on main commits.
45-
# if: ${{ github.ref == 'refs/heads/main' }}
45+
if: ${{ github.ref == 'refs/heads/main' }}
4646
runs-on: macos-13
4747
timeout-minutes: 60
4848
env:
@@ -56,7 +56,7 @@ jobs:
5656
sudo rm -rf \
5757
/usr/local/var/homebrew \
5858
/usr/local/bin/brew /usr/local/Homebrew /usr/local/Cellar /usr/local/Caskroom \
59-
/usr/local/bin/pydoc* /usr/local/bin/python* /usr/local/bin/2to3* /usr/local/bin/idle3* \
59+
/usr/local/bin/pydoc* /usr/local/bin/python* /usr/local/bin/pip* /usr/local/bin/2to3* /usr/local/bin/idle3* \
6060
/usr/local/bin/chromedriver
6161
- name: install
6262
run: |

ci/devenv-bootstrap.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ linux_x86_64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-
8181
linux_x86_64_sha256 = efc0f295dd878e510ab12ea36bbadc3db03c687ab30c07e86c7cdba7eed879a9
8282
# used for autoupdate
8383
version = v20.13.1
84-
yarn_version = 1.22.22
8584
8685
[colima]
8786
darwin_x86_64 = https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Darwin-x86_64
@@ -117,13 +116,6 @@ if [[ "$got" != "$expected" ]]; then
117116
exit 1
118117
fi
119118

120-
expected="${HOME}/code/sentry/.devenv/bin/yarn"
121-
got=$(command -v yarn)
122-
if [[ "$got" != "$expected" ]]; then
123-
echo "unexpected yarn location ${got}, expected ${expected}"
124-
exit 1
125-
fi
126-
127119
# devenv-bootstrap.sh overrides sentry devenv config.ini with this version
128120
expected="v20.13.1"
129121
# more rigorous check than node --version
@@ -132,11 +124,3 @@ if [[ "$got" != "$expected" ]]; then
132124
echo "unexpected node version ${got}, expected ${expected}"
133125
exit 1
134126
fi
135-
136-
# devenv-bootstrap.sh overrides sentry devenv config.ini with this version
137-
expected="1.22.22"
138-
got=$(yarn --version)
139-
if [[ "$got" != "$expected" ]]; then
140-
echo "unexpected yarn version ${got}, expected ${expected}"
141-
exit 1
142-
fi

0 commit comments

Comments
 (0)