diff --git a/.github/workflows/book-gh-pages.yml b/.github/workflows/book-gh-pages.yml index 1a0a3f2f..d30bf95a 100644 --- a/.github/workflows/book-gh-pages.yml +++ b/.github/workflows/book-gh-pages.yml @@ -4,9 +4,10 @@ on: # Allows running this workflow manually workflow_dispatch: push: - branches: - - master - - nixos-24.05 + # The book must be built from only the master branch, + # in order to have a single file that defines the build, + # and not 3+ 'book-gh-pages.yml' files on each branch which must be the same. + branches: [master] permissions: contents: read @@ -38,6 +39,11 @@ jobs: ref: master path: dev persist-credentials: false + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: nixos-24.11 + path: nixos-24.11 + persist-credentials: false - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: nixos-24.05 diff --git a/pkgs/ci-scripts/build-docs-multiversion.nix b/pkgs/ci-scripts/build-docs-multiversion.nix index 51013dda..8578d2de 100644 --- a/pkgs/ci-scripts/build-docs-multiversion.nix +++ b/pkgs/ci-scripts/build-docs-multiversion.nix @@ -4,9 +4,10 @@ writers, epnixLib, }: let - stable = "nixos-24.05"; + stable = "nixos-24.11"; versions = [ "dev" + "nixos-24.11" "nixos-24.05" ]; baseurl = "https://epics-extensions.github.io/EPNix";