Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Blog post #106

Merged
merged 8 commits into from
Jun 21, 2024
Merged

Blog post #106

merged 8 commits into from
Jun 21, 2024

Conversation

alessandrobenedetti
Copy link
Contributor

From staging to prod

lizbiella and others added 7 commits June 17, 2024 15:50
@lizbiella
Create 2024-06-17-hybrid-search.md
b650293 
Added the blogpost about Hybrid Search
@janhoy
Build site with github action (#99)
08f9477
@lizbiella
Update 2024-06-17-hybrid-search.md
d42e6d0 
Applied changes after review
@janhoy
Temporarily disable vex pluging (#103)
f8ab7ee 
This is to avoid having to install custom python packages
@janhoy
Bump python package versions (#101)
6e1eb79 
* Do not trigger build for certain files
* Remove unused mdx_include markdown extension
@janhoy
Add a static copy of the VEX table as a stop gap (#105)
ba79233
@alessandrobenedetti
Merge pull request #100 from SeaseLtd/lisa
1d04240 
Blogpost about Hybrid Search
@alessandrobenedetti
Copy link
Contributor Author

@janhoy apparently there are conflicts, not sure why this could happen?

Also I noticed that It didn't squash the commits from the blog pull request, is it something we don't do for the site?
Normally it does it automatically for the solr code

@janhoy
Copy link
Contributor

janhoy commented Jun 21, 2024

@janhoy apparently there are conflicts, not sure why this could happen?

Also I noticed that It didn't squash the commits from the blog pull request, is it something we don't do for the site? Normally it does it automatically for the solr code

We do not squash commits for website, but use merge commit. The file asf.yaml SHALL be different between the branches, that's why there is a conflict. Will try to resolve.

@janhoy
Copy link
Contributor

janhoy commented Jun 21, 2024

Resolved!

@janhoy janhoy merged commit d76e990 into production Jun 21, 2024
1 check passed
@alessandrobenedetti
Copy link
Contributor Author

hi @janhoy when are we supposed to see the changes online?
I took a look this morning and it's not there yet?

@janhoy janhoy deleted the merge-to-prod branch June 24, 2024 11:33
@janhoy
Copy link
Contributor

janhoy commented Jun 24, 2024

hi @janhoy when are we supposed to see the changes online? I took a look this morning and it's not there yet?

https://solr.apache.org/blog.html

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alessandrobenedetti @janhoy @lizbiella