Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref(py3): Remove SENTRY_PYTHON3 and -py3 versons #764

Merged
merged 4 commits into from
Dec 4, 2020
Merged

ref(py3): Remove SENTRY_PYTHON3 and -py3 versons #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
419b63a
ref(py3): Remove SENTRY_PYTHON3 and -py3 versons
BYK Dec 4, 2020
c144241
come on GitHub Actions...
BYK Dec 4, 2020
d24e745
okay maybe a bit faster
BYK Dec 4, 2020
f04d920
back to 10
BYK Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
env:
COMPOSE_PARALLEL_LIMIT: 10
SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
SENTRY_PYTHON3: ${{ matrix.py2 != '1' || ''}}
run: |
./install.sh
./test.sh
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ x-sentry-defaults: &sentry_defaults
args:
- SENTRY_IMAGE
- SENTRY_PYTHON2
- SENTRY_PYTHON3
image: sentry-onpremise-local
depends_on:
- redis
Expand Down
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ echo ""
$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true

# We may not have the set image on the repo (local images) so allow fails
docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3} || true;
docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2} || true;

echo ""
echo "Building and tagging Docker images..."
Expand Down
3 changes: 1 addition & 2 deletions sentry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARG SENTRY_IMAGE
ARG SENTRY_PYTHON2
ARG SENTRY_PYTHON3
FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3}
FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}

COPY . /usr/src/sentry

Expand Down