Skip to content
This repository has been archived by the owner on Sep 7, 2023. It is now read-only.

[fix] Makefile target gh-pages & flatten history of branch gh.pages #2514

Merged
merged 1 commit into from Feb 1, 2021
Merged

[fix] Makefile target gh-pages & flatten history of branch gh.pages #2514

merged 1 commit into from Feb 1, 2021

Conversation

return42
Copy link
Contributor

@return42 return42 commented Jan 28, 2021

[fix] Makefile target gh-pages & flatten history of branch gh.pages

  1. This patch fixes error:

     rm -rf gh-pages/
     make V=1 gh-pages
         make[1]: Leaving directory '/800GBPCIex4/share/searx'
     [ -d "gh-pages/.git" ] || git clone  gh-pages
     fatal: repository 'gh-pages' does not exist
    
  2. The gh-page build has been moved to ./build/gh-pages this also affects
    'travis-gh-pages'

  3. The gh-pages commit messages now includes a ref to the repository and commit

  4. Since a gh-pages history has only the drawback that the reposetory grows
    fast, this patch also flattens the history:

     cd build/gh-pages/; git log --oneline
     bash: cd: build/gh-pages/: Datei oder Verzeichnis nicht gefunden
     026126b (HEAD -> gh-pages, origin/gh-pages) make gh-pages: from https://github.com/return42/searx.git@71d66979c2935312e0aed7fc7c3cf6199fbe88a2
    

Related issues

Remove cryptic fly dirt from the commit message: JamesIves/github-pages-deploy-action#576

utils/makefile.sphinx Outdated Show resolved Hide resolved
@return42 return42 changed the title [fix] makefile target gh-pages and flatten history [fix] Makefile target gh-pages & flatten history of branch gh.pages Jan 29, 2021
@return42
Copy link
Contributor Author

I implemented a solution ... using git worktree .. also see updated #2514 (comment)

Do you know why the py3.8 build fails? I guess it has nothing to do with this PR .. or did I missed something?

@dalf
Copy link
Contributor

dalf commented Jan 29, 2021

The worktree solution is nice.

Do you know why the py3.8 build fails? I guess it has nothing to do with this PR .. or did I missed something?

I know, it is not related to this PR.
It github action cache problem and perhaps

if ! cat $(PY_ENV)/requirements.sha256 2>/dev/null | sha256sum --check --status 2>/dev/null; then \

The gh-page build has been moved to ./build/gh-pages this also affects 'travis-gh-pages'

FOLDER: gh-pages

Should be FOLDER: build/gh-pages

@return42
Copy link
Contributor Author

Should be FOLDER: build/gh-pages

Ah, OK I will fixed it / thanks!

1. This patch fixes error:

    rm -rf gh-pages/
    make V=1 gh-pages
    make[1]: Leaving directory '/800GBPCIex4/share/searx'
    [ -d "gh-pages/.git" ] || git clone  gh-pages
    fatal: repository 'gh-pages' does not exist

2. The gh-page build has been moved to ./build/gh-pages this also affects
   'travis-gh-pages'

3. The gh-pages commit messages now includes a ref to the repository and commit

4. Since a gh-pages history has only the drawback that the reposetory grows
   fast, this patch also flattens the history:

    cd build/gh-pages/; git log --oneline
    bash: cd: build/gh-pages/: Datei oder Verzeichnis nicht gefunden
    026126b (HEAD -> gh-pages, origin/gh-pages) make gh-pages: from https://github.com/return42/searx.git@71d66979c2935312e0aed7fc7c3cf6199fbe88a2

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
@return42
Copy link
Contributor Author

It github action cache problem and perhaps

I had a look but ...
I'm not very familiar with github actions :)

Do you know why it crashes now and how we can fix it?

@return42
Copy link
Contributor Author

return42 commented Feb 1, 2021

Just want to leave a link here: JamesIves/github-pages-deploy-action#576 (comment)

@dalf dalf self-requested a review February 1, 2021 16:06
Copy link
Contributor

@dalf dalf left a comment

Choose a reason for hiding this comment

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

Thank you !

@dalf dalf merged commit 9924444 into searx:master Feb 1, 2021
@return42 return42 deleted the fix-gh-pages branch February 1, 2021 16:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants