Skip to content
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
34 changes: 12 additions & 22 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,38 @@ name: "CI"
on:
pull_request:
push:
branches: [master]
concurrency:
group: ci-${{ github.event_name }}-${{ github.ref }}
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
env:
MAINLINE: refs/heads/master
DOCKERTAG: latest
steps:
- uses: actions/checkout@v2
- uses: cachix/install-nix-action@v16
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v31
with:
extra_nix_config: |
experimental-features = nix-command flakes
# This also runs nix-build.
- uses: cachix/cachix-action@v10
- uses: cachix/cachix-action@v16
with:
name: srid
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
# Only needed for private caches
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
# This downloads deps from Nix cache, builds neuron, as well as run tests
- name: Build 🔧
run: |
nix-build -j4 --no-out-link ci.nix
# Test default.nix
nix-build -j4
# Test flake.nix
nix build --out-link flake-result
- name: Verify output of default.nix & flake.nix
run: |
[ $(readlink result) = $(readlink flake-result) ]
run: nix build -j4
- name: Retrieve neuron version
run: |
echo "NEURONVER=$(./result/bin/neuron --version)" >> $GITHUB_ENV
- name: Publish Docker image to Docker Hub
if: ${{ github.ref == env.MAINLINE && runner.os == 'Linux' }}
if: ${{ github.ref == 'refs/heads/master' && runner.os == 'Linux' }}
run: |
docker load -i $(nix-build docker.nix --argstr tag "${{ env.DOCKERTAG }}")
docker tag "sridca/neuron:${{ env.DOCKERTAG }}" "sridca/neuron:${{env.NEURONVER}}"
docker load -i $(nix build .#dockerImage --print-out-paths)
docker tag "sridca/neuron:dev" "sridca/neuron:latest"
docker tag "sridca/neuron:dev" "sridca/neuron:${{ env.NEURONVER }}"
echo ${{ secrets.DOCKER_PASS }} | docker login -u sridca --password-stdin
set -x
docker push "sridca/neuron:${{ env.DOCKERTAG }}"
docker push "sridca/neuron:latest"
docker push "sridca/neuron:${{ env.NEURONVER }}"
23 changes: 12 additions & 11 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
name: "Publish Neuron site"
on:
# Run only when pushing to master branch
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: cachix/install-nix-action@v16
- uses: cachix/cachix-action@v10
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v31
with:
extra_nix_config: |
experimental-features = nix-command flakes
- uses: cachix/cachix-action@v16
with:
name: srid
# This builds neuron, as well as run tests
- name: Install neuron
run: nix-env -if .
run: nix profile install .
- name: Build neuron site 🔧
run: |
neuron --version
neuron -d doc/ gen --pretty-urls
- name: Deploy to GitHub Pages 🚀
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: doc/.neuron/output
CLEAN: true
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: doc/.neuron/output
clean: true
11 changes: 0 additions & 11 deletions ci.nix

This file was deleted.

1 change: 0 additions & 1 deletion dep/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions dep/directory-contents/default.nix

This file was deleted.

8 changes: 0 additions & 8 deletions dep/directory-contents/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/directory-contents/thunk.nix

This file was deleted.

2 changes: 0 additions & 2 deletions dep/nix-filter/default.nix

This file was deleted.

7 changes: 0 additions & 7 deletions dep/nix-filter/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/nix-filter/thunk.nix

This file was deleted.

2 changes: 0 additions & 2 deletions dep/nix-thunk/default.nix

This file was deleted.

7 changes: 0 additions & 7 deletions dep/nix-thunk/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/nix-thunk/thunk.nix

This file was deleted.

2 changes: 0 additions & 2 deletions dep/pandoc-link-context/default.nix

This file was deleted.

8 changes: 0 additions & 8 deletions dep/pandoc-link-context/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/pandoc-link-context/thunk.nix

This file was deleted.

2 changes: 0 additions & 2 deletions dep/reflex-dom-pandoc/default.nix

This file was deleted.

8 changes: 0 additions & 8 deletions dep/reflex-dom-pandoc/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/reflex-dom-pandoc/thunk.nix

This file was deleted.

2 changes: 0 additions & 2 deletions dep/reflex-fsnotify/default.nix

This file was deleted.

7 changes: 0 additions & 7 deletions dep/reflex-fsnotify/github.json

This file was deleted.

9 changes: 0 additions & 9 deletions dep/reflex-fsnotify/thunk.nix

This file was deleted.

35 changes: 0 additions & 35 deletions docker.nix

This file was deleted.

2 changes: 0 additions & 2 deletions exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@

module Main where

import GHC.IO.Handle (BufferMode (LineBuffering))
import Main.Utf8 (withUtf8)
import Neuron.CLI.App (run)
import qualified Neuron.Reactor as Reactor
import Relude
import System.IO (hSetBuffering)

main :: IO ()
main = do
Expand Down
Loading
Loading