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

fix: try another action for GitHub Pages deployments #153

Merged
merged 1 commit into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 4 additions & 8 deletions code/hsec-tools/src/Security/Advisories/Generate/HTML.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading