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

Fixes google-chrome not found for Mac users in Docker setup #19512

Merged
merged 9 commits into from
Jan 24, 2024

Conversation

jaiakash
Copy link
Contributor

Overview

  1. This PR fixes [BUG]: google-chrome not found for Mac users in Docker setup #19339.
  2. This PR does the following:
  • Creates a conditional statement to find chrome version based on current operating system (have added mac os command).
  • Refracted the code to have variable OS_NAME before it is used in the makefile
  1. The original bug occurred because the command to find the chrome version was specific to Linux, here I have added command for macos systems as well.

Essential Checklist

  • This PR fixes the "Fix #bugnum: " or "Fix part of #bugnum: ...", followed by a short, clear summary of the changes.
  • I have followed the instructions for making a code change.
  • I have assigned the correct reviewers to this PR (or will leave a comment with the phrase "@{{reviewer_username}} PTAL" if I don't have permissions to assign reviewers directly).
  • The linter/Karma presubmit checks pass on my local machine, and my PR follows the coding style guide).
  • "Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)

Proof that changes are correct

Screenshot 2024-01-17 at 4 20 43 PM

PR Pointers

@jaiakash jaiakash requested a review from a team as a code owner January 17, 2024 10:51
@jaiakash jaiakash requested a review from DubeySandeep January 17, 2024 10:51
Copy link

oppiabot bot commented Jan 17, 2024

Assigning @DubeySandeep for the first pass review of this PR. Thanks!

Copy link
Contributor

@gp201 gp201 left a comment

Choose a reason for hiding this comment

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

Thanks, @jaiakash ! I left some comments. PTAL

Makefile Outdated Show resolved Hide resolved
@oppiabot oppiabot bot unassigned gp201 Jan 17, 2024
Copy link

oppiabot bot commented Jan 17, 2024

Unassigning @gp201 since the review is done.

Copy link

oppiabot bot commented Jan 17, 2024

Hi @jaiakash, it looks like some changes were requested on this pull request by @gp201. PTAL. Thanks!

@jaiakash jaiakash requested a review from gp201 January 19, 2024 16:47
Copy link
Contributor

@gp201 gp201 left a comment

Choose a reason for hiding this comment

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

LGTM

@gp201
Copy link
Contributor

gp201 commented Jan 19, 2024

@DubeySandeep PTAL

Copy link

oppiabot bot commented Jan 23, 2024

Unassigning @DubeySandeep since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Jan 23, 2024
Copy link

oppiabot bot commented Jan 23, 2024

Hi @jaiakash, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to ask someone to merge your PR once the CI checks pass and you're happy with it. Thanks!

Copy link
Contributor

@gp201 gp201 left a comment

Choose a reason for hiding this comment

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

LGTM

@gp201 gp201 added this pull request to the merge queue Jan 23, 2024
Copy link

oppiabot bot commented Jan 23, 2024

Hi @jaiakash, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to ask someone to merge your PR once the CI checks pass and you're happy with it. Thanks!

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 24, 2024
@gp201 gp201 enabled auto-merge January 24, 2024 00:34
@gp201 gp201 added this pull request to the merge queue Jan 24, 2024
Merged via the queue into oppia:develop with commit d9972cc Jan 24, 2024
70 checks passed
@jaiakash jaiakash deleted the chrome-macos-version-fix branch January 27, 2024 13:38
Aakash-Jakhmola pushed a commit to Aakash-Jakhmola/oppia that referenced this pull request Jan 30, 2024
)

* fix: chrome version for mac

* chore: removed newlines

* chore: refracted the variables name
github-merge-queue bot pushed a commit that referenced this pull request Feb 20, 2024
…butor admin dashboard (#19594)

* fix language name in language dropdown to list language name first

* change var to let

* fix integration test

* Fix #19511: make name optional for subscribing (#19534)

* fix #19511: make name optional for subscribing

* fix lint

* use Optional

* return non_empty validator

* remove Union

* Fix #18661: Specific partnership interest form for each language (#19402)

* Fix #18661: specific partnership form link

* linting

* frontend tests

* ts-checks

* fixes

* minor changes

* resolve conflict

* fix tests

* Fix issue #19408 About Page is not responsive (#19530)

changes done in about-page.component.css

Co-authored-by: 2008sahil <getinter6@gmail.com>

* Fix #18512: Graph Interaction Mobile Grey Out Bug (#19532)

* Fix Reset Button Styling on Graph

* Change to Flow Root

* Fix #18079: Add fixed height to Skill dialogbox (#19558)

* added fixed height

* fixed search bar

* lint

---------

Co-authored-by: Nikita Vorobev <vorobyev.nikita@gmail.com>

* Fix #19398 Added make stop in case of non zero exit code (#19483)

* Trap command used to check for Sudden Exit of running tests on code

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* changed done as reuqired

* coe updated to check for exit aprt from keyboard interrupt also

* code for all tests updated in makeflie to stop containers in any case of failure

* code for all tests updated in makeflie to stop containers in any case of failure

* make stop will executed for all exit code apart from 0 now

* removed extra spaces

* removed the extra echo commands

* backend tests workflow changed

* backend tests workflow changed

* removed the extra echo commands

* Fixes google-chrome not found for Mac users in Docker setup (#19512)

* fix: chrome version for mac

* chore: removed newlines

* chore: refracted the variables name

* Fix #19545: Exploration editor category creating new categories when selecting old ones. (#19549)

* Fix Exploration Editor Category Select

* Change to Value Change

* Fix #19536: Adds hover effect to subscribe button on android page (#19565)

* button replaced by primary-button in android page, also disabled attribute added

* fix linter error

* Creates voiceover language policy model (#19456)

* Creates voiceover model

* Adds test for entity voiceover model

* Add voiceover domain and service methods.

* Adds voiceover domain and services tests

* Fixes mypy checks

* Creates voiceover policy model

* Fixes linter issues.

* Address review comments

* Adds regex check for language accent code

* Updates voiceover policy model name.

* Adds voiceover language accent constants

* Adds language accent codes list for voiceovers

* updates docstring

* updates docstring

* Deletes voice policy dir and shifts it into voiceover dir

* Adds helper methods to get & save in VoiceoverAutogenerationPolicyModel

* Creates json files to stores L-a constants.

* Adds test to validate voiceover language accent constants.

* Removes dead code

* Updates code comment

* Updates code comment

* Updates Readme.

* Adds note to developers

* Updates code comment

* GSoC_2.5: Frontend changes to enable pinning of opportunties (#19122)

* Front-end changes

* Fix frontend tests

* Fix frontend tests

* Fix linting

* Fix tests

* Fix tests

* Fix tests

* Fix linting

* Fix linting

* Fix linting

* Fix CI checks

* Fix all linting errors

* Update the frontend files and write unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing CI checks

* Fix failing unit tests

* Fix CI Checks

* Fix lint checks

* Fix typescript typecheck errors

* Fix typescript typecheck errors

* Fix typescript typecheck errors

* Address Review Comments

* Fix flaky tests

* Fix lints and add coverage tests

* Fix lints and add coverage tests

* Fix #15377: Interaction changes still remain in pop-up after cancellation (#19579)

Fix Customization Args Saved Memento

* Fix issue #19576:Library Page Search Results Alignment Issue  (#19588)

searched results alligned to center

Co-authored-by: 2008sahil <getinter6@gmail.com>

* use regex for matching

* change regex

* Fix #19516: Navigation issues in the blog author page (#19517)

fix: Navigation issues in the blog author page

* fix : [BUG]: Cursor should be hand pointer instead of text pointer #19575 (#19584)

* Click-Arrow edit button text solved

* some minor fixes

* Fix issue #19407:Blog page is not responsive on mobile devices (#19474)

* fixed UI changes in blog page

* passing lint testcase1

* passing lint testcase2

* all lint case passed

* all lint case passed

* final commit

* done suggested changes

* Suggested Changes Done

* added media query at 470px

* fixed UI changes in blog page

* passing lint testcase1

* passing lint testcase2

* all lint case passed

* all lint case passed

* final commit

* done suggested changes

* Suggested Changes Done

* Resolved responsive issues in blog page

* solved responsive issues

* added margin to blog-navigate icon

* fixed all changes

* linter issue resolved

* linter issue resolved

* all linter checks resolved

* changed naming to no-result-found

---------

Co-authored-by: 2008sahil <getinter6@gmail.com>

* FIX #19571 : Add a space after "or" Conjunction and Second Option in Exploration Multi-selection. (#19573)

{{Fix spacing with OR}}

Co-authored-by: Sean Lip <sean@seanlip.org>

* Fix #10647: Fixed faulty navbar on topic editor (#19567)

* fixed the navbar on subtopic page and also added necessary tests

* removed unnecessary function

* fixed coverage issues

* added dynamic icon in navbar

* fixed some linting issues

* simplified the boolean expression

* Fix #19507: Corrected responsive design for exploration editor nav tools  (#19600)

Fixed responsive issue with exploration editor

* Remove unused dependencies: `py` (via `pytest` upgrade)and `PyGithub` (#19553)

* removed unused deps

* removed unused tests

* upgraded pytest to 7.4.4

* fix regex

* fix docstring

* fix tests

* fix test

* fix test

---------

Co-authored-by: Nikita Vorobev <vorobyev.nikita@gmail.com>
Co-authored-by: Yashwardhan Jyani <100014271+yashwardhan-jyani@users.noreply.github.com>
Co-authored-by: Sahil Gupta <155609546+2008sahil@users.noreply.github.com>
Co-authored-by: 2008sahil <getinter6@gmail.com>
Co-authored-by: Justin Nguyen <70992422+jnvtnguyen@users.noreply.github.com>
Co-authored-by: Harsh Keshari <108923011+hrshkshri@users.noreply.github.com>
Co-authored-by: Yash Dugriyal <127002519+yash1378@users.noreply.github.com>
Co-authored-by: Akash Jaiswal <akashjaiswal3846@gmail.com>
Co-authored-by: sagar-subedi <66303548+sagar-subedi@users.noreply.github.com>
Co-authored-by: Nikhil <nikhil.agarwal.2019@gmail.com>
Co-authored-by: Ashwath Kannan <98253080+Ash-2k3@users.noreply.github.com>
Co-authored-by: Afzal Khan <tricktomade@gmail.com>
Co-authored-by: Yogesh Saini <97088265+Ykumar1415@users.noreply.github.com>
Co-authored-by: Rahat <136263179+rahat2134@users.noreply.github.com>
Co-authored-by: Sean Lip <sean@seanlip.org>
Co-authored-by: Sambhav Kaushik <92575005+masterboy376@users.noreply.github.com>
Co-authored-by: amyyeung17 <amyyeung17@gmail.com>
Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com>
jayam04 pushed a commit to jayam04/oppia that referenced this pull request Feb 21, 2024
…ontributor admin dashboard (oppia#19594)

* fix language name in language dropdown to list language name first

* change var to let

* fix integration test

* Fix oppia#19511: make name optional for subscribing (oppia#19534)

* fix oppia#19511: make name optional for subscribing

* fix lint

* use Optional

* return non_empty validator

* remove Union

* Fix oppia#18661: Specific partnership interest form for each language (oppia#19402)

* Fix oppia#18661: specific partnership form link

* linting

* frontend tests

* ts-checks

* fixes

* minor changes

* resolve conflict

* fix tests

* Fix issue oppia#19408 About Page is not responsive (oppia#19530)

changes done in about-page.component.css

Co-authored-by: 2008sahil <getinter6@gmail.com>

* Fix oppia#18512: Graph Interaction Mobile Grey Out Bug (oppia#19532)

* Fix Reset Button Styling on Graph

* Change to Flow Root

* Fix oppia#18079: Add fixed height to Skill dialogbox (oppia#19558)

* added fixed height

* fixed search bar

* lint

---------

Co-authored-by: Nikita Vorobev <vorobyev.nikita@gmail.com>

* Fix oppia#19398 Added make stop in case of non zero exit code (oppia#19483)

* Trap command used to check for Sudden Exit of running tests on code

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* trap command is added with sigint handler

* changed done as reuqired

* coe updated to check for exit aprt from keyboard interrupt also

* code for all tests updated in makeflie to stop containers in any case of failure

* code for all tests updated in makeflie to stop containers in any case of failure

* make stop will executed for all exit code apart from 0 now

* removed extra spaces

* removed the extra echo commands

* backend tests workflow changed

* backend tests workflow changed

* removed the extra echo commands

* Fixes google-chrome not found for Mac users in Docker setup (oppia#19512)

* fix: chrome version for mac

* chore: removed newlines

* chore: refracted the variables name

* Fix oppia#19545: Exploration editor category creating new categories when selecting old ones. (oppia#19549)

* Fix Exploration Editor Category Select

* Change to Value Change

* Fix oppia#19536: Adds hover effect to subscribe button on android page (oppia#19565)

* button replaced by primary-button in android page, also disabled attribute added

* fix linter error

* Creates voiceover language policy model (oppia#19456)

* Creates voiceover model

* Adds test for entity voiceover model

* Add voiceover domain and service methods.

* Adds voiceover domain and services tests

* Fixes mypy checks

* Creates voiceover policy model

* Fixes linter issues.

* Address review comments

* Adds regex check for language accent code

* Updates voiceover policy model name.

* Adds voiceover language accent constants

* Adds language accent codes list for voiceovers

* updates docstring

* updates docstring

* Deletes voice policy dir and shifts it into voiceover dir

* Adds helper methods to get & save in VoiceoverAutogenerationPolicyModel

* Creates json files to stores L-a constants.

* Adds test to validate voiceover language accent constants.

* Removes dead code

* Updates code comment

* Updates code comment

* Updates Readme.

* Adds note to developers

* Updates code comment

* GSoC_2.5: Frontend changes to enable pinning of opportunties (oppia#19122)

* Front-end changes

* Fix frontend tests

* Fix frontend tests

* Fix linting

* Fix tests

* Fix tests

* Fix tests

* Fix linting

* Fix linting

* Fix linting

* Fix CI checks

* Fix all linting errors

* Update the frontend files and write unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing unit tests

* Fix failing CI checks

* Fix failing unit tests

* Fix CI Checks

* Fix lint checks

* Fix typescript typecheck errors

* Fix typescript typecheck errors

* Fix typescript typecheck errors

* Address Review Comments

* Fix flaky tests

* Fix lints and add coverage tests

* Fix lints and add coverage tests

* Fix oppia#15377: Interaction changes still remain in pop-up after cancellation (oppia#19579)

Fix Customization Args Saved Memento

* Fix issue oppia#19576:Library Page Search Results Alignment Issue  (oppia#19588)

searched results alligned to center

Co-authored-by: 2008sahil <getinter6@gmail.com>

* use regex for matching

* change regex

* Fix oppia#19516: Navigation issues in the blog author page (oppia#19517)

fix: Navigation issues in the blog author page

* fix : [BUG]: Cursor should be hand pointer instead of text pointer oppia#19575 (oppia#19584)

* Click-Arrow edit button text solved

* some minor fixes

* Fix issue oppia#19407:Blog page is not responsive on mobile devices (oppia#19474)

* fixed UI changes in blog page

* passing lint testcase1

* passing lint testcase2

* all lint case passed

* all lint case passed

* final commit

* done suggested changes

* Suggested Changes Done

* added media query at 470px

* fixed UI changes in blog page

* passing lint testcase1

* passing lint testcase2

* all lint case passed

* all lint case passed

* final commit

* done suggested changes

* Suggested Changes Done

* Resolved responsive issues in blog page

* solved responsive issues

* added margin to blog-navigate icon

* fixed all changes

* linter issue resolved

* linter issue resolved

* all linter checks resolved

* changed naming to no-result-found

---------

Co-authored-by: 2008sahil <getinter6@gmail.com>

* FIX oppia#19571 : Add a space after "or" Conjunction and Second Option in Exploration Multi-selection. (oppia#19573)

{{Fix spacing with OR}}

Co-authored-by: Sean Lip <sean@seanlip.org>

* Fix oppia#10647: Fixed faulty navbar on topic editor (oppia#19567)

* fixed the navbar on subtopic page and also added necessary tests

* removed unnecessary function

* fixed coverage issues

* added dynamic icon in navbar

* fixed some linting issues

* simplified the boolean expression

* Fix oppia#19507: Corrected responsive design for exploration editor nav tools  (oppia#19600)

Fixed responsive issue with exploration editor

* Remove unused dependencies: `py` (via `pytest` upgrade)and `PyGithub` (oppia#19553)

* removed unused deps

* removed unused tests

* upgraded pytest to 7.4.4

* fix regex

* fix docstring

* fix tests

* fix test

* fix test

---------

Co-authored-by: Nikita Vorobev <vorobyev.nikita@gmail.com>
Co-authored-by: Yashwardhan Jyani <100014271+yashwardhan-jyani@users.noreply.github.com>
Co-authored-by: Sahil Gupta <155609546+2008sahil@users.noreply.github.com>
Co-authored-by: 2008sahil <getinter6@gmail.com>
Co-authored-by: Justin Nguyen <70992422+jnvtnguyen@users.noreply.github.com>
Co-authored-by: Harsh Keshari <108923011+hrshkshri@users.noreply.github.com>
Co-authored-by: Yash Dugriyal <127002519+yash1378@users.noreply.github.com>
Co-authored-by: Akash Jaiswal <akashjaiswal3846@gmail.com>
Co-authored-by: sagar-subedi <66303548+sagar-subedi@users.noreply.github.com>
Co-authored-by: Nikhil <nikhil.agarwal.2019@gmail.com>
Co-authored-by: Ashwath Kannan <98253080+Ash-2k3@users.noreply.github.com>
Co-authored-by: Afzal Khan <tricktomade@gmail.com>
Co-authored-by: Yogesh Saini <97088265+Ykumar1415@users.noreply.github.com>
Co-authored-by: Rahat <136263179+rahat2134@users.noreply.github.com>
Co-authored-by: Sean Lip <sean@seanlip.org>
Co-authored-by: Sambhav Kaushik <92575005+masterboy376@users.noreply.github.com>
Co-authored-by: amyyeung17 <amyyeung17@gmail.com>
Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG]: google-chrome not found for Mac users in Docker setup
3 participants