-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
reuse built frontend in ci, merge compose files #6674
Conversation
9847808
to
130cc4b
Compare
@justinclift could you please review this MR? |
@AndrewChubatiuk It's unlikely I'll have much free time to review Redash stuff today. 😦 Maybe one of the others can help instead? 😄 |
5886fd2
to
cc8ab2b
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6674 +/- ##
==========================================
- Coverage 63.82% 63.37% -0.45%
==========================================
Files 161 162 +1
Lines 13060 13170 +110
Branches 1803 1819 +16
==========================================
+ Hits 8335 8347 +12
- Misses 4425 4532 +107
+ Partials 300 291 -9 |
f0bb400
to
2f0f9ea
Compare
Thinking this bit over:
I'm unsure if we want that rename. My thinking is that |
.github/workflows/ci.yml
Outdated
REDASH_PRODUCTION: "true" | ||
PERCY_TOKEN: ddbcffd4497c339ea4dd356b9cd04c998f84f311df06b3dc96146a8a1228d170 | ||
CYPRESS_PROJECT_ID: 924cka | ||
CYPRESS_RECORD_KEY: c0592115-a05c-4746-a203-ffc080db6881 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same question as above. 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these values were just b64 encoded. need to move them to secrets
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can remove these values if you can move them to secrets
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sounded familiar, so after some looking I've found previous discussion about those values:
f3892e0#commitcomment-120444257
Looks like they were put there on purpose when we were previously using CircleCI.
... this was intentional for CircleCI, because secrets don't work with PRs from Forked repositories.
We've moved from CircleCI to GitHub Actions, but the same thing might apply. We'd probably want to double check though, just to be sure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
github actions with pull_request
event type have the same behavior as in CircleCI, but we can try pull_request_target
, which requires more attention to PR before running it, cause it provides a token with a write access to base repo, but also provides an access to base repo secrets
be7b32a
to
bc5ceba
Compare
@justinclift could you please review it again? |
@guidopetri @justinclift @eradman could you please review this MR? |
407ec87
to
2e7638e
Compare
When I run the build there are a number of new warnings:
The build works, but these messages make it look like I am missing a step. I'd say we should only emit a warning if the developer has an incomplete configuration. |
517ffdc
to
6af65dc
Compare
@eradman made these variable overridable and empty by default to remove warnings |
f5274b1
to
3d39948
Compare
e3b319c
to
d3a51b7
Compare
d3a51b7
to
2fe6376
Compare
@@ -68,3 +54,27 @@ services: | |||
- "1080:1080" | |||
- "1025:1025" | |||
restart: unless-stopped | |||
cypress: | |||
ipc: host |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting. Hadn't come across this docker setting before. Looks useful to know about for some situations. 😄
https://docs.docker.com/reference/cli/docker/container/run/#ipc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks 95% good to me. The only two important things that I think need changing before it can be merged are:
-
Change the
migrate
name back tocreate_db
in the docker entrypoint- And whatever calls that name of course
-
Remove the change of
REDASH_REDIS_URL
environment variable- It's already documented using this name
-
Remove the change of
REDASH_DATABASE_URL
environment variable- It's already documented using this name
For updating this, please just add new commits so I don't have to re-review the entire thing. 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
99% there now. Just needs the Makefile target changed in order to merge this. 😄
There was a problem hiding this 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. 😄
Ahhh, yeah. We might as well include the lint change too. All good. 😄 |
…)" Revert all commits >= 3f19534 These changes were far to invasive to test properly.
What type of PR is this?
Description
local
- spins up all services in a setup, that previously was indocker-compose.yml
e2e
- spins up all services in a setup, that previously was in.ci/docker-compose.cypress.yml
default
(no profile set) - spins up all services in a setup, that previously was in.ci/docker-compose.yml
How is this tested?
Mobile & Desktop Screenshots/Recordings (if there are UI changes)