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.

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

Revert build (2 of 2) #6967

Merged
merged 1 commit into from
May 14, 2024
Merged

Revert build (2 of 2) #6967

merged 1 commit into from
May 14, 2024

Conversation

eradman
Copy link
Collaborator

@eradman eradman commented May 14, 2024

What type of PR is this?

  • Revert

Description

Commands used

cp -r ../redash-alt/.ci .
cp -r ../redash-alt/client/cypress client/
cp ../redash-alt/Dockerfile .
cp ../redash-alt/Makefile .
cp ../redash-alt/bin/docker-entrypoint bin/
cp ../redash-alt/compose.yaml .
cp ../redash-alt/package.json .

git rm Dockerfile.cypress
git add .ci/*
git add client/cypress/cypress.js client/cypress/integration/dashboard/*.js
git add Dockerfile Makefile bin/docker-entrypoint compose.yaml package.json

black tests/handlers/test_query_results.py
git add tests/handlers/test_query_results.py

git commit -m 'Revert build (2 of 2)'

How is this tested?

  • Unit tests (pytest, jest)
  • E2E Tests (Cypress)
  • Manually

Related Tickets & Documents

#6964

@eradman
Copy link
Collaborator Author

eradman commented May 14, 2024

This change should be rebased once #6965 is merged

#!/bin/bash
NAME=redash
VERSION=$(jq -r .version package.json)
FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably look into that $CIRCLE_BUILD_NUM variable at some future point, since we're not using CircleCI any more.

Not super relevant for this PR though. 😉

curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
&& curl https://packages.microsoft.com/config/debian/12/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update \
&& ACCEPT_EULA=Y apt-get install -y --no-install-recommends msodbcsql17 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After we apply this PR, we'll probably want to re-apply the patch which updates to v18 of MS ODBC SQL.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely

package.json Outdated Show resolved Hide resolved
yarn.lock Outdated Show resolved Hide resolved
@justinclift
Copy link
Member

@eradman Just tried updating this after merging the first patch, and its now failing the lint checks (and possibly other stuff too).

You ok to look into it? 😄

@eradman
Copy link
Collaborator Author

eradman commented May 14, 2024

@eradman Just tried updating this after merging the first patch, and its now failing the lint checks (and possibly other stuff too).

You ok to look into it? 😄

I actually put the black command to run in the commit message, but didn't run it. Pushing an update

getredash#6964

Commands used

cp -r ../redash-alt/.ci .
cp -r ../redash-alt/client/cypress client/
cp ../redash-alt/Dockerfile .
cp ../redash-alt/Makefile .
cp ../redash-alt/bin/docker-entrypoint bin/
cp ../redash-alt/compose.yaml .
cp ../redash-alt/package.json .

git rm Dockerfile.cypress
git add .ci/*
git add client/cypress/cypress.js client/cypress/integration/dashboard/*.js
git add Dockerfile Makefile bin/docker-entrypoint compose.yaml package.json

black tests/handlers/test_query_results.py
git add tests/handlers/test_query_results.py

git commit -m 'Revert build (2 of 2)'
Copy link
Member

@justinclift justinclift left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. 😄

@justinclift justinclift enabled auto-merge (squash) May 14, 2024 12:12
@justinclift justinclift merged commit 58cc49b into getredash:master May 14, 2024
11 checks passed
@eradman eradman deleted the revert-build branch May 14, 2024 12:32
@eradman eradman mentioned this pull request May 14, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants