Skip to content
Snippets Groups Projects

origin-search: Add search QL autocomplete

Open Kumar Shivendu requested to merge generated-differential-D7490-source into master

origin-search: Add search QL autocomplete


Migrated from D7490 (view on Phabricator)

Merge request reports

Pipeline #2667 failed

Pipeline failed for e590540e on generated-differential-D7490-source

Ready to merge by members who can write to the target branch.

Merge details

  • The source branch is 737 commits behind the target branch.
  • 0 commits and 1 merge commit will be added to .
  • Source branch will not be deleted.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build has FAILED

    Patch application report for D7490 (id=27163)

    Rebasing onto ad5add7d...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 534cdd120ea3acf3a7a4b90a6809fa4580fbcddb
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit e80d1b4f76f8365ccc2ea176b19a9905772b7bf1
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1651/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1651/console

    Edited by vlorentz
  • Author Contributor
    • origin-search: Add tokens.js file
  • Author Contributor
    • search-ql-autocomplete.js: Update tokens.js path
  • Build has FAILED

    Patch application report for D7490 (id=27164)

    Rebasing onto ad5add7d...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 8bdc5ddd205e7dc553ee215677211edfd71c3cac
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 534cdd120ea3acf3a7a4b90a6809fa4580fbcddb
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit e80d1b4f76f8365ccc2ea176b19a9905772b7bf1
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1652/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1652/console

    Edited by vlorentz
  • Build has FAILED

    Patch application report for D7490 (id=27165)

    Rebasing onto ad5add7d...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 9d47ef870f01739632e8ac83637ebb6db629e75c
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit 8bdc5ddd205e7dc553ee215677211edfd71c3cac
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 534cdd120ea3acf3a7a4b90a6809fa4580fbcddb
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit e80d1b4f76f8365ccc2ea176b19a9905772b7bf1
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1653/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1653/console

    Edited by vlorentz
  • Author Contributor

    Build swh_ql.wasm from swh-search (using the C files) and serve it using Webpack

  • Author Contributor

    Update PR to be w.r.t. origin/master

  • Build has FAILED

    Patch application report for D7490 (id=27487)

    Rebasing onto 8b919bc4...

    First, rewinding head to replay your work on top of it...
    Applying: origin-search: Add search QL autocomplete
    Using index info to reconstruct a base tree...
    M	assets/src/bundles/browse/origin-search.js
    M	package.json
    M	swh/web/settings/common.py
    M	yarn.lock
    Falling back to patching base and 3-way merge...
    Auto-merging yarn.lock
    CONFLICT (content): Merge conflict in yarn.lock
    Auto-merging swh/web/settings/common.py
    Auto-merging package.json
    Auto-merging assets/src/bundles/browse/origin-search.js
    CONFLICT (content): Merge conflict in assets/src/bundles/browse/origin-search.js
    Patch failed at 0001 origin-search: Add search QL autocomplete
    
    Resolve all conflicts manually, mark them as resolved with
    "git add/rm <conflicted_files>", then run "git rebase --continue".
    You can instead skip this commit: run "git rebase --skip".
    To abort and get back to the state before "git rebase", run "git rebase --abort".
    

    Rebase failed (ret=1)!

    Could not rebase; Attempt merge onto 8b919bc4...

    Already up to date.
    Changes applied before test
    commit 979cf714501d80219da5a8c797fbbb2b68bd39fc
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 9d47ef870f01739632e8ac83637ebb6db629e75c
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit 8bdc5ddd205e7dc553ee215677211edfd71c3cac
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 534cdd120ea3acf3a7a4b90a6809fa4580fbcddb
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit e80d1b4f76f8365ccc2ea176b19a9905772b7bf1
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1719/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1719/console

    Edited by vlorentz
  • Author Contributor
    • feat(Makefile): Run build-ts-wasm after yarn install
  • Build has FAILED

    Patch application report for D7490 (id=27489)

    Rebasing onto 8b919bc4...

    First, rewinding head to replay your work on top of it...
    Applying: origin-search: Add search QL autocomplete
    Using index info to reconstruct a base tree...
    M	assets/src/bundles/browse/origin-search.js
    M	package.json
    M	swh/web/settings/common.py
    M	yarn.lock
    Falling back to patching base and 3-way merge...
    Auto-merging yarn.lock
    CONFLICT (content): Merge conflict in yarn.lock
    Auto-merging swh/web/settings/common.py
    Auto-merging package.json
    Auto-merging assets/src/bundles/browse/origin-search.js
    CONFLICT (content): Merge conflict in assets/src/bundles/browse/origin-search.js
    Patch failed at 0001 origin-search: Add search QL autocomplete
    
    Resolve all conflicts manually, mark them as resolved with
    "git add/rm <conflicted_files>", then run "git rebase --continue".
    You can instead skip this commit: run "git rebase --skip".
    To abort and get back to the state before "git rebase", run "git rebase --abort".
    

    Rebase failed (ret=1)!

    Could not rebase; Attempt merge onto 8b919bc4...

    Already up to date.
    Changes applied before test
    commit 195fce79b7499462e4330790d4ed82eede3e462f
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:00:52 2022 +0530
    
        feat(Makefile): Run build-ts-wasm after yarn install
    
    commit 979cf714501d80219da5a8c797fbbb2b68bd39fc
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 9d47ef870f01739632e8ac83637ebb6db629e75c
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit 8bdc5ddd205e7dc553ee215677211edfd71c3cac
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 534cdd120ea3acf3a7a4b90a6809fa4580fbcddb
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit e80d1b4f76f8365ccc2ea176b19a9905772b7bf1
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1720/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1720/console

    Edited by vlorentz
  • Author Contributor
    • Fixed rebase merge conflict
  • Build has FAILED

    Patch application report for D7490 (id=27490)

    Rebasing onto 8b919bc4...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 605f20adc886a31bd8e9b7f94f995e01dbbac5cf
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:00:52 2022 +0530
    
        feat(Makefile): Run build-ts-wasm after yarn install
    
    commit 5d4f94b956e91cb7c20011352212436b785d3e46
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 3665fb8ade7a769e3bc15d6ee3e4cc9288636285
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit a3c1f0a8d3ea043f1be039e6caae15e4af16f9d0
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 5b7ea8566bb083e50a801bf9be00f48838daa698
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit 198efc99a90ba6a514ab05deb363a0c093fa071a
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1721/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1721/console

    Edited by vlorentz
  • Author Contributor
    • feat(package.json): Run build-ts-wasm using postinstall instead of make command
  • Build has FAILED

    Patch application report for D7490 (id=27491)

    Rebasing onto 8b919bc4...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 1918a5237ccd216b49a6b7a3c5306722fb6cb9d3
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:31:42 2022 +0530
    
        feat(package.json): Run build-ts-wasm using postinstall instead of make command
    
    commit 605f20adc886a31bd8e9b7f94f995e01dbbac5cf
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:00:52 2022 +0530
    
        feat(Makefile): Run build-ts-wasm after yarn install
    
    commit 5d4f94b956e91cb7c20011352212436b785d3e46
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 3665fb8ade7a769e3bc15d6ee3e4cc9288636285
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit a3c1f0a8d3ea043f1be039e6caae15e4af16f9d0
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 5b7ea8566bb083e50a801bf9be00f48838daa698
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit 198efc99a90ba6a514ab05deb363a0c093fa071a
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1722/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1722/console

    Edited by vlorentz
  • Author Contributor
    • feat(package.json): Copy steps from build-ts-wasm make command to postinstall script
  • Build has FAILED

    Patch application report for D7490 (id=27492)

    Rebasing onto 8b919bc4...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 5ceb7ccf30053a681c8ddddd24ecdd0df6bd9e10
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:44:11 2022 +0530
    
        feat(package.json): Copy steps from build-ts-wasm make command to post-install
    
    commit 1918a5237ccd216b49a6b7a3c5306722fb6cb9d3
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:31:42 2022 +0530
    
        feat(package.json): Run build-ts-wasm using postinstall instead of make command
    
    commit 605f20adc886a31bd8e9b7f94f995e01dbbac5cf
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:00:52 2022 +0530
    
        feat(Makefile): Run build-ts-wasm after yarn install
    
    commit 5d4f94b956e91cb7c20011352212436b785d3e46
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 3665fb8ade7a769e3bc15d6ee3e4cc9288636285
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit a3c1f0a8d3ea043f1be039e6caae15e4af16f9d0
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 5b7ea8566bb083e50a801bf9be00f48838daa698
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit 198efc99a90ba6a514ab05deb363a0c093fa071a
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1723/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1723/console

    Edited by vlorentz
  • Author Contributor
    • feat(package.json): Use python3 in postinstall script
  • Build has FAILED

    Patch application report for D7490 (id=27494)

    Rebasing onto 8b919bc4...

    Current branch diff-target is up to date.
    Changes applied before test
    commit 1660d5555c2e0132d1a0a326a876056f7c78d730
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:54:12 2022 +0530
    
        feat(package.json): Use python3 in postinstall script
    
    commit 5ceb7ccf30053a681c8ddddd24ecdd0df6bd9e10
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:44:11 2022 +0530
    
        feat(package.json): Copy steps from build-ts-wasm make command to post-install
    
    commit 1918a5237ccd216b49a6b7a3c5306722fb6cb9d3
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:31:42 2022 +0530
    
        feat(package.json): Run build-ts-wasm using postinstall instead of make command
    
    commit 605f20adc886a31bd8e9b7f94f995e01dbbac5cf
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sat Apr 16 11:00:52 2022 +0530
    
        feat(Makefile): Run build-ts-wasm after yarn install
    
    commit 5d4f94b956e91cb7c20011352212436b785d3e46
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Fri Apr 15 20:54:05 2022 +0530
    
        Build .wasm using swh-search and serve it
    
    commit 3665fb8ade7a769e3bc15d6ee3e4cc9288636285
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:38:54 2022 +0530
    
        search-ql-autocomplete.js: Update tokens.js path
    
    commit a3c1f0a8d3ea043f1be039e6caae15e4af16f9d0
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:33:07 2022 +0530
    
        origin-search: Add tokens.js file
    
    commit 5b7ea8566bb083e50a801bf9be00f48838daa698
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:06:25 2022 +0530
    
        origin-search: Add search QL autocomplete
    
    commit 198efc99a90ba6a514ab05deb363a0c093fa071a
    Author: KShivendu <shivendu@iitbhilai.ac.in>
    Date:   Sun Apr 3 20:05:01 2022 +0530
    
        origin-search: Add search QL autocomplete

    Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1724/ See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1724/console

    Edited by vlorentz
  • Author Contributor
    • feat(package.json): Use docker for building wasm and print glibc version
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading