diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 4c051a19..bbdef0e6 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -56,10 +56,9 @@ jobs: cp generatedWebsite/by-dates.html generatedWebsite/index.html rm -Rf generatedWebsite/advisories || echo "Markdown links issue has been fixed" - name: Deploy - uses: s0/git-publish-subdir-action@develop - env: - REPO: self - BRANCH: generated/gh-pages - FOLDER: generatedWebsite - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SQUASH_HISTORY: true + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./generatedWebsite + publish_branch: generated/gh-pages + force_orphan: true diff --git a/code/hsec-tools/src/Security/Advisories/Generate/HTML.hs b/code/hsec-tools/src/Security/Advisories/Generate/HTML.hs index 90bd988b..4591d62b 100644 --- a/code/hsec-tools/src/Security/Advisories/Generate/HTML.hs +++ b/code/hsec-tools/src/Security/Advisories/Generate/HTML.hs @@ -15,17 +15,15 @@ import Data.Ord (Down (..)) import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.IO as T -import System.Exit (exitFailure) -import System.IO (stderr, hPrint) - import Distribution.Pretty (prettyShow) import Lucid -import Validation (Validation(..)) - import qualified Security.Advisories as Advisories +import Security.Advisories.Filesystem (listAdvisories) import System.Directory (createDirectoryIfMissing) +import System.Exit (exitFailure) import System.FilePath (()) -import Security.Advisories.Filesystem (listAdvisories) +import System.IO (hPrint, stderr) +import Validation (Validation (..)) -- * Actions @@ -58,8 +56,6 @@ renderAdvisoriesIndex src dst = do div_ [class_ "pure-u-1"] $ toHtmlRaw (Advisories.advisoryHtml advisory) - writeFile (dst ".nojekyll") "" - -- * Rendering types data AdvisoryR = AdvisoryR