Skip to content

Commit

Permalink
Merge branch 'master' into mount-point
Browse files Browse the repository at this point in the history
  • Loading branch information
srid authored Mar 10, 2024
2 parents c72e9d0 + 096b14a commit efa681a
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 108 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,43 +48,3 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs-static
cname: emanote.srid.ca

docker-build:
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- name: Build as docker img
id: build
run: |
nix build -j auto -o docker-img .#packages.x86_64-linux.dockerImage
# docker
export DOCKERIMG=$(readlink ./docker-img)
echo "::set-output name=docker-img::${DOCKERIMG}"
- name: Upload docker image tgz
uses: actions/upload-artifact@v4
if: github.ref == 'refs/heads/master'
with:
name: docker-img
retention-days: 1
path: |
${{ steps.build.outputs.docker-img }}
docker-push:
needs: docker-build
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
env:
DOCKERTAG: latest
steps:
- name: Download docker img
uses: actions/download-artifact@v4
with:
name: docker-img
- name: Load Docker img
run: |
docker load -i *docker-image-emanote.tar.gz
- name: Publish Docker image to Docker Hub
run: |
echo ${{ secrets.DOCKER_PASS }} | docker login -u sridca --password-stdin
set -x
docker push sridca/emanote:latest
12 changes: 1 addition & 11 deletions docs/start/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ order: 1
Emanote is supported on all popular operating systems through [Nix]. If you are new to Nix, checkout [this tutorial](https://nixos.asia/en/nix-first).

1. [Install Nix & enable Flakes](https://nixos.asia/en/install)
1. For Windows, see [[wsl]] or [the Docker approach](https://github.com/srid/emanote/issues/230)
1. For Windows, see [[wsl]]
1. For NixOS, see [[nix]]
2. Run `nix profile install github:srid/emanote` to install Emanote

Expand All @@ -32,13 +32,3 @@ emanote -L /path/to/notebook gen /tmp/output
```

[Nix]: https://nixos.asia/en/nix

## Non-nix methods

If you do not wish to use Nix, you may use Emanote in one of the following ways:

| Method | Long-term support | Platforms |
| ---------- | ----------------- | ----------------- |
| [[docker]] | Guaranteed | Linux, WSL, macOS |

Nix and [[docker]] are the only mechanisms the author intends to support in the long-term.
18 changes: 0 additions & 18 deletions docs/start/install/docker.md

This file was deleted.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
inputs.flake-root.flakeModule
inputs.treefmt-nix.flakeModule
./nix/flake-module.nix
./nix/docker.nix
];

perSystem = { pkgs, lib, config, system, ... }: {
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
notebook := "../docs"
notebook := "../docs;/Users/srid/code/nixos-asia-website/en@asia"

default:
@just --list
Expand Down
37 changes: 0 additions & 37 deletions nix/docker.nix

This file was deleted.

0 comments on commit efa681a

Please sign in to comment.