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

[Backport release-24.05] bookstack: 24.05.3 -> 24.05.4 #339492

Open
wants to merge 1 commit into
base: release-24.05
Choose a base branch
from

Conversation

HritwikSinghal
Copy link
Contributor

@HritwikSinghal HritwikSinghal commented Sep 4, 2024

(cherry picked from commit a8f5ef6)

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

#338990

(cherry picked from commit a8f5ef6)
@HritwikSinghal HritwikSinghal changed the title [Backport release-24.05] bookstack: 24.05.2 -> 24.05.4 [Backport release-24.05] bookstack: 24.05.3 -> 24.05.4 Sep 4, 2024
@HritwikSinghal HritwikSinghal mentioned this pull request Sep 4, 2024
13 tasks
@SuperSandro2000
Copy link
Member

Should the test fail?

@HritwikSinghal
Copy link
Contributor Author

Should the test fail?

Note this should not necessarily be treated as a hard fail, but a reviewer's attention should be drawn to it and github actions have no way of doing that but to raise a 'failure'

@HritwikSinghal
Copy link
Contributor Author

HritwikSinghal commented Sep 4, 2024

i've checked the changes and they match what the latest master has. i think this cherry-pick test fails as NixOS 24.04 had bookstack upgrade v24.05.3 -> v24.05.4 and the unstable had v24.05.2 -> v24.05.4.

So when i cherry-picked it, i used --strategy-option theirs and merged the new changes. Should work fine as the final file is same as whats on master.

@SuperSandro2000

@SuperSandro2000
Copy link
Member

Note this should not necessarily be treated as a hard fail, but a reviewer's attention should be drawn to it and github actions have no way of doing that but to raise a 'failure'

I know, we are using github status' wrong.

> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
   INFO  Discovering packages.  
  laravel/socialite ..................................................... DONE
  laravel/tinker ........................................................ DONE
  nesbot/carbon ......................................................... DONE
  nunomaduro/termwind ................................................... DONE
  socialiteproviders/manager ............................................ DONE
Generated optimized autoload files containing 7344 classes
> @php -r "!file_exists('bootstrap/cache/services.php') || @unlink('bootstrap/cache/services.php');"
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Package operations: 3 installs, 0 updates, 0 removals
  - Downloading symfony/polyfill-php83 (v1.30.0)
  - Downloading intervention/gif (4.1.0)
  - Downloading firebase/php-jwt (v6.10.1)
 0/3 [>---------------------------]   0%    Failed to download symfony/polyfill-php83 from dist: curl error 6 while downloading https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9: Could not resolve host: api.github.com
    Now trying to download from source
  - Syncing symfony/polyfill-php83 (v1.30.0) into cache
    Failed to download intervention/gif from dist: curl error 6 while downloading https://api.github.com/repos/Intervention/gif/zipball/3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3: Could not resolve host: api.github.com
    Now trying to download from source
  - Syncing intervention/gif (4.1.0) into cache
    Failed to download firebase/php-jwt from dist: curl error 6 while downloading https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5: Could not resolve host: api.github.com
    Now trying to download from source
  - Syncing firebase/php-jwt (v6.10.1) into cache
 3/3 [============================] 100%
In Git.php line 473:
                                                                               
  Failed to clone https://github.com/symfony/polyfill-php83.git via https, ss  
  h protocols, aborting.                                                       
                                                                               
  - https://github.com/symfony/polyfill-php83.git                              
    Cloning into bare repository '/build/.cache/composer/vcs/https---github.c  
  om-symfony-polyfill-php83.git'...                                            
    fatal: unable to access 'https://github.com/symfony/polyfill-php83.git/':  
   Could not resolve host: github.com                                          
                                                                               
  - git@github.com:symfony/polyfill-php83.git                                  
    Cloning into bare repository '/build/.cache/composer/vcs/https---github.c  
  om-symfony-polyfill-php83.git'...                                            
    error: cannot run ssh: No such file or directory                           
    fatal: unable to fork                                                      
                                                                               
install [--prefer-source] [--prefer-dist] [--prefer-install PREFER-INSTALL] [--dry-run] [--download-only] [--dev] [--no-suggest] [--no-dev] [--no-autoloader] [--no-progress] [--no-install] [--audit] [--audit-format AUDIT-FORMAT] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [-a|--classmap-authoritative] [--apcu-autoloader] [--apcu-autoloader-prefix APCU-AUTOLOADER-PREFIX] [--ignore-platform-req IGNORE-PLATFORM-REQ] [--ignore-platform-reqs] [--] [<packages>...]
error: builder for '/nix/store/hpscrkgif0dhzly12pnkmr119acgpmbr-bookstack.drv' failed with exit code 1;

@risicle
Copy link
Contributor

risicle commented Sep 7, 2024

The cherry-pick weirdness here is because somehow the stable branch ended up with 24.05.3 while master remained on 24.05.2. I would probably just remove the cherry-pick line from the commit message as it's just not closely related enough.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants