Skip to content

Commit 2ecb5cc

Browse files
blackheavenfrasertweedale
authored andcommitted
fix: try another action for GitHub Pages deployments
1 parent 84afd78 commit 2ecb5cc

File tree

2 files changed

+10
-15
lines changed
  • .github/workflows
  • code/hsec-tools/src/Security/Advisories/Generate

2 files changed

+10
-15
lines changed

.github/workflows/nix.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ jobs:
5656
cp generatedWebsite/by-dates.html generatedWebsite/index.html
5757
rm -Rf generatedWebsite/advisories || echo "Markdown links issue has been fixed"
5858
- name: Deploy
59-
uses: s0/git-publish-subdir-action@develop
60-
env:
61-
REPO: self
62-
BRANCH: generated/gh-pages
63-
FOLDER: generatedWebsite
64-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65-
SQUASH_HISTORY: true
59+
uses: peaceiris/actions-gh-pages@v3
60+
with:
61+
github_token: ${{ secrets.GITHUB_TOKEN }}
62+
publish_dir: ./generatedWebsite
63+
publish_branch: generated/gh-pages
64+
force_orphan: true

code/hsec-tools/src/Security/Advisories/Generate/HTML.hs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ import Data.Ord (Down (..))
1515
import Data.Text (Text)
1616
import qualified Data.Text as T
1717
import qualified Data.Text.IO as T
18-
import System.Exit (exitFailure)
19-
import System.IO (stderr, hPrint)
20-
2118
import Distribution.Pretty (prettyShow)
2219
import Lucid
23-
import Validation (Validation(..))
24-
2520
import qualified Security.Advisories as Advisories
21+
import Security.Advisories.Filesystem (listAdvisories)
2622
import System.Directory (createDirectoryIfMissing)
23+
import System.Exit (exitFailure)
2724
import System.FilePath ((</>))
28-
import Security.Advisories.Filesystem (listAdvisories)
25+
import System.IO (hPrint, stderr)
26+
import Validation (Validation (..))
2927

3028
-- * Actions
3129

@@ -58,8 +56,6 @@ renderAdvisoriesIndex src dst = do
5856
div_ [class_ "pure-u-1"] $
5957
toHtmlRaw (Advisories.advisoryHtml advisory)
6058

61-
writeFile (dst </> ".nojekyll") ""
62-
6359
-- * Rendering types
6460

6561
data AdvisoryR = AdvisoryR

0 commit comments

Comments
 (0)