diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b13789..40107f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1 +1,19 @@ +image: nixos/nix +workflow: + rules: + - if: $CI_COMMIT_BRANCH + +pages: + stage: deploy + script: + - mkdir -p "$HOME/.config/nix" + - echo 'experimental-features = nix-command flakes' > "$HOME/.config/nix/nix.conf" + - nix build + - cp -r result/ public + artifacts: + paths: + - public + rules: + - if: $CI_COMMIT_BRANCH == "main" + environment: production diff --git a/flake.lock b/flake.lock index d83df95..2fc1d1f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -17,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650998007, - "narHash": "sha256-NcJnbGDBBN023x8s3ll3HZxBcQoPq1ry9E2sjg+4flc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3917caedfead19f853aa5769de4c3ea4e4db584", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.11", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -35,6 +38,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2eab802..7808242 100644 --- a/flake.nix +++ b/flake.nix @@ -1,32 +1,32 @@ { - description = "Trying nest.js"; - + description = "Phenix website"; + inputs = { - nixpkgs.url = "nixpkgs/nixos-21.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; in - rec { - packages = flake-utils.lib.flattenTree { - hello = pkgs.hello; - gitAndTools = pkgs.gitAndTools; - nodejs = pkgs.nodejs; + let + pkgs = nixpkgs.legacyPackages.${system}; + build-static-files = pkgs.stdenv.mkDerivation { + name = "phenix-website-static-assets"; + src = ./static; + buildPhase = '' + find . -type f -exec ${pkgs.brotli}/bin/brotli -9 -f -k {} \; + ''; + installPhase = '' + cp -r . $out + + ''; }; - defaultPackage = packages.hello; - apps.hello = flake-utils.lib.mkApp { drv = packages.hello; }; - defaultApp = apps.hello; + in { + packages = { static = build-static-files; }; devShell = pkgs.mkShell { - name = "Nid-JS"; - buildInputs = with pkgs; [ - nodejs - flyway - nodePackages.node2nix - ]; + name = "Phenix-Website"; + buildInputs = with pkgs; [ deno ]; }; - } - ); + }); } diff --git a/files/.directory b/static/files/.directory similarity index 100% rename from files/.directory rename to static/files/.directory diff --git a/files/aga2016.pdf b/static/files/aga2016.pdf similarity index 100% rename from files/aga2016.pdf rename to static/files/aga2016.pdf diff --git a/files/charte_organisationnelle_2021.pdf b/static/files/charte_organisationnelle_2021.pdf similarity index 100% rename from files/charte_organisationnelle_2021.pdf rename to static/files/charte_organisationnelle_2021.pdf diff --git a/files/code_de_conduite.pdf b/static/files/code_de_conduite.pdf similarity index 100% rename from files/code_de_conduite.pdf rename to static/files/code_de_conduite.pdf diff --git a/files/code_de_conduite_2019.pdf b/static/files/code_de_conduite_2019.pdf similarity index 100% rename from files/code_de_conduite_2019.pdf rename to static/files/code_de_conduite_2019.pdf diff --git a/files/code_ethique_2021.pdf b/static/files/code_ethique_2021.pdf similarity index 100% rename from files/code_ethique_2021.pdf rename to static/files/code_ethique_2021.pdf diff --git a/files/formulaire_inscription_2021.pdf b/static/files/formulaire_inscription_2021.pdf similarity index 100% rename from files/formulaire_inscription_2021.pdf rename to static/files/formulaire_inscription_2021.pdf diff --git a/files/inscription2015.pdf b/static/files/inscription2015.pdf similarity index 100% rename from files/inscription2015.pdf rename to static/files/inscription2015.pdf diff --git a/files/inscription2016.pdf b/static/files/inscription2016.pdf similarity index 100% rename from files/inscription2016.pdf rename to static/files/inscription2016.pdf diff --git a/files/inscription2017.doc b/static/files/inscription2017.doc similarity index 100% rename from files/inscription2017.doc rename to static/files/inscription2017.doc diff --git a/files/inscription2017.pdf b/static/files/inscription2017.pdf similarity index 100% rename from files/inscription2017.pdf rename to static/files/inscription2017.pdf diff --git a/files/inscription2018.pdf b/static/files/inscription2018.pdf similarity index 100% rename from files/inscription2018.pdf rename to static/files/inscription2018.pdf diff --git a/files/inscription2019.pdf b/static/files/inscription2019.pdf similarity index 100% rename from files/inscription2019.pdf rename to static/files/inscription2019.pdf diff --git a/files/inscription_et_code_2019.pdf b/static/files/inscription_et_code_2019.pdf similarity index 100% rename from files/inscription_et_code_2019.pdf rename to static/files/inscription_et_code_2019.pdf diff --git a/files/regle_de_jeux_2021.pdf b/static/files/regle_de_jeux_2021.pdf similarity index 100% rename from files/regle_de_jeux_2021.pdf rename to static/files/regle_de_jeux_2021.pdf diff --git a/files/reglements_de_terrain2015.pdf b/static/files/reglements_de_terrain2015.pdf similarity index 100% rename from files/reglements_de_terrain2015.pdf rename to static/files/reglements_de_terrain2015.pdf diff --git a/files/reglements_de_terrain2016.pdf b/static/files/reglements_de_terrain2016.pdf similarity index 100% rename from files/reglements_de_terrain2016.pdf rename to static/files/reglements_de_terrain2016.pdf diff --git a/files/reglements_de_terrain2019.docx b/static/files/reglements_de_terrain2019.docx similarity index 100% rename from files/reglements_de_terrain2019.docx rename to static/files/reglements_de_terrain2019.docx diff --git a/files/reglements_de_terrain2019.pdf b/static/files/reglements_de_terrain2019.pdf similarity index 100% rename from files/reglements_de_terrain2019.pdf rename to static/files/reglements_de_terrain2019.pdf diff --git a/files/reglements_generaux.pdf b/static/files/reglements_generaux.pdf similarity index 100% rename from files/reglements_generaux.pdf rename to static/files/reglements_generaux.pdf diff --git a/files/regles_et_procedures_2021.pdf b/static/files/regles_et_procedures_2021.pdf similarity index 100% rename from files/regles_et_procedures_2021.pdf rename to static/files/regles_et_procedures_2021.pdf diff --git a/files/regles_procedures2015.pdf b/static/files/regles_procedures2015.pdf similarity index 100% rename from files/regles_procedures2015.pdf rename to static/files/regles_procedures2015.pdf diff --git a/files/regles_procedures2016.pdf b/static/files/regles_procedures2016.pdf similarity index 100% rename from files/regles_procedures2016.pdf rename to static/files/regles_procedures2016.pdf diff --git a/files/regles_procedures2017.pdf b/static/files/regles_procedures2017.pdf similarity index 100% rename from files/regles_procedures2017.pdf rename to static/files/regles_procedures2017.pdf diff --git a/files/regles_procedures2018.pdf b/static/files/regles_procedures2018.pdf similarity index 100% rename from files/regles_procedures2018.pdf rename to static/files/regles_procedures2018.pdf diff --git a/files/regles_procedures2019.docx b/static/files/regles_procedures2019.docx similarity index 100% rename from files/regles_procedures2019.docx rename to static/files/regles_procedures2019.docx diff --git a/files/regles_procedures2019.pdf b/static/files/regles_procedures2019.pdf similarity index 100% rename from files/regles_procedures2019.pdf rename to static/files/regles_procedures2019.pdf