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
30 changes: 3 additions & 27 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,38 +37,14 @@ jobs:
git --no-pager log ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
nix develop . --command cog check ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}

build-docker:
build:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
statuses: write
steps:
- uses: actions/checkout@v5
- uses: DeterminateSystems/determinate-nix-action@v3
- name: Build site
run: |
nix build --print-build-logs
mkdir dist
cp -r --no-preserve=mode,ownership,timestamps result/* dist/

- uses: docker/metadata-action@v5
id: meta
with:
images: ghcr.io/${{ github.repository }}
- uses: docker/login-action@v3
if: github.event_name != 'pull_request'
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v6
with:
context: .
file: deploy/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

success:
if: always()
Expand All @@ -78,10 +54,10 @@ jobs:
- eslint
- cog
- tsc
- build-docker
- build

steps:
- name: Check other jovs
- name: Check other jobs
uses: re-actors/alls-green@release/v1
with:
allowed-skips: cog
Expand Down
11 changes: 0 additions & 11 deletions deploy/Dockerfile

This file was deleted.

25 changes: 0 additions & 25 deletions deploy/nginx.conf

This file was deleted.

14 changes: 8 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

cocogitto
];
npmDepsHash = "sha256-XAzDSXub5xLzoUYXosH2Gqy9De0bzOgfoyOB4jFUKJU=";
npmDepsHash = "sha256-+k/xmVJV0qQ8PDHV3AYN4wOJmP/k+RjFt8Q906wCJVA=";
in
{
devShells.${system}.default = pkgs.mkShell {
Expand All @@ -31,13 +31,15 @@

src = self;

buildPhase = ''
npm run build
'';

installPhase = ''
mkdir $out
cp -r dist/* $out
tar -cz \
--sort=name \
--mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 --numeric-owner \
--format=gnu \
-f $out/notlebedev.tar.gz \
-C dist .
'';

inherit nativeBuildInputs npmDepsHash;
Expand Down
5 changes: 0 additions & 5 deletions netlify.toml

This file was deleted.

Loading