Use Nix flake for building the site #2

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

Merged

ColdCalzone merged 8 commits into master from dev

Apr 22, 2025

.github/workflows/deploy_neocities.yml

-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     name: Deploy to neocities
-    on: [workflow_dispatch, push]
+    on:
+      workflow_dispatch:
+      push:
+        branches:
+          - main
     concurrency: # prevent concurrent deploys doing strange things
       group: deploy-to-neocities
@@ Expand All / @@ -10,7 +14,6 @@ jobs: @@
       # https://gist.github.com/AndrewLester/2d3e6257d932831756226ca9a281d9b5
       build_site:
         runs-on: ubuntu-latest
-        if: ${{ contains(github.event.head_commit.message, '!UPD8') || github.event_name == 'workflow_dispatch' }}
         steps:
           - name: Checkout
@@ Expand All / @@ -23,51 +26,29 @@ jobs: @@
               git pull --recurse-submodules
               git submodule update --remote --recursive
+          - name: Install Nix
+            uses: cachix/install-nix-action@v31
           # If you're using pnpm, add this step then change the commands and cache key below to use `pnpm`
           # - name: Install pnpm
           #   uses: pnpm/action-setup@v3
           #   with:
           #     version: 8
-          - name: Install Node.js
-            uses: actions/setup-node@v4
-            with:
-              node-version: 20
-              cache: npm
-          - name: Install dependencies
-            run: npm install
-          # - name: Install wasm-pack
-            # uses: jetli/wasm-pack-action@v0.4.0
-            # with:
-              # version: 'latest'
           - name: build
+            uses: cachix/install-nix-action@v31
             env:
               BASE_PATH: '/${{ github.event.repository.name }}'
             run: |
-              npm run build
-          - name: Authenticate
-            uses: oleksiyrudenko/gha-git-credentials@v2-latest
-            with:
-              token: '${{ secrets.GITHUB_TOKEN }}'
-          - name: Commit changes
-            run: |
-              git add -A
-              git commit -m "Automatically build site"
-              git push
+              nix build
+              mkdir -p public/
+              cp -r result/* public/
-    #  deploy:
-    #    needs: build_site
-    #    runs-on: ubuntu-latest
-    #    if: ${{ contains(github.event.head_commit.message, '!UPD8') || github.event_name == 'workflow_dispatch' }}
-    #    steps:
           - name: Deploy to neocities
             if: ${{ success() || failure() }}
             uses: bcomnes/deploy-to-neocities@v1.1.9
             with:
               api_token: ${{ secrets.NEOCITIES_API_TOKEN }}
               cleanup: false
-              dist_dir: public
+              dist_dir: result

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ node_modules @@
     !.env.example
     vite.config.js.timestamp-*
     vite.config.ts.timestamp-*
+    /result

flake.nix

-Original file line number
+Diff line change
@@ -1,4 +1,7 @@
     {
+      description = "";
       inputs = {
         nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
         flake-utils.url = "github:numtide/flake-utils";
@@ Expand All / @@ -7,17 +10,31 @@ @@
         flake-utils.lib.eachDefaultSystem
           (system:
             let
-              overlays = [ ];
-              pkgs = import nixpkgs {
-                inherit system overlays;
-              };
+              pkgs = import nixpkgs { inherit system; };
+              nativeBuildInputs = with pkgs; [
+                wasm-pack
+                nodejs
+              ];
             in
             with pkgs;
             {
-              devShells.default = mkShell {
-                buildInputs = [
-                  wasm-pack
-                ];
+              packages.default = buildNpmPackage {
+                pname = "deep-freezer";
+                version = "1.0.0";
+                nativeBuildInputs = nativeBuildInputs;
+                src = ./.;
+                npmDepsHash = "sha256-aX5sIAfW+9d7pPg9FBjiiSGNjbKE2KoE97tKtKMXDKA=";
+                npmBuild = ''
+                  npm run build
+                '';
+                installPhase = ''
+                  mkdir -p $out
+                  cp -r public/* $out
+                '';
               };
             }
           );
@@ Expand Down @@

public/ButtonToggle.png

Binary file not shown.

public/ButtonToggleSlider.png

Binary file not shown.

public/_app/env.js

This file was deleted.

public/_app/immutable/assets/12.DVoKC6fD.css

This file was deleted.

public/_app/immutable/assets/13.CaOLp-Yy.css

This file was deleted.

public/_app/immutable/assets/16.BzofsrWt.css

This file was deleted.

public/_app/immutable/assets/2.DenuX07o.css

This file was deleted.

public/_app/immutable/assets/3.ZRlRIiNG.css

This file was deleted.

public/_app/immutable/assets/6.B_SY1GJM.css

Empty file.

public/_app/immutable/assets/8.HlJpdsa1.css

This file was deleted.

public/_app/immutable/assets/9.DsOj0O0R.css

This file was deleted.

public/_app/immutable/assets/Box.CE-fN9k1.css

This file was deleted.

public/_app/immutable/assets/Navigation.C8OD8Ft-.css

This file was deleted.

public/_app/immutable/assets/_layout.CifQbGgN.css

This file was deleted.

public/_app/immutable/assets/_layout.DenuX07o.css

This file was deleted.

public/_app/immutable/assets/_page.B_SY1GJM.css

Empty file.

public/_app/immutable/assets/_page.BzofsrWt.css

This file was deleted.

public/_app/immutable/assets/_page.CaOLp-Yy.css

This file was deleted.

public/_app/immutable/assets/_page.DVoKC6fD.css

This file was deleted.

public/_app/immutable/assets/_page.DsOj0O0R.css

This file was deleted.

public/_app/immutable/assets/_page.MAjhx0ea.css

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Nix flake for building the site #2

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!