git.iko.soy/typeable/octopod
on master help sign in
Use new cachix (#162)

* Use new cachix * set auth key * Add system to css assets

commitebdcb8886a83318342f1640648c4f7de38dc9405 authoriko <ilyakooo0@gmail.com> dateThu 17 Feb 2022, 15:58 (5 years ago) parent5c7956c
4 files changed+10−8
compare with master
unifiedsplit
.github/actions/common_setup/action.yaml+4−4 .github/workflows/build.yaml+3−3 nix/default.nix+1−1 octopod-css/default.nix+2
.github/actions/common_setup/action.yaml+4−4
@@ -1,8 +1,8 @@
11name: "Common setup"
22description: "Common setup steps"
33inputs:
4− cachixSigningKey:
5− description: "Cachix signing key"
4+ authToken:
5+ description: "Cachix auth token"
66 required: true
77runs:
88 using: "composite"
@@ -36,5 +36,5 @@ runs:
3636 - name: Login to Cachix
3737 uses: cachix/cachix-action@v10
3838 with:
39− name: octopod
40− signingKey: ${{ inputs.cachixSigningKey }}
39+ name: typeable
40+ authToken: ${{ inputs.authToken }}
.github/workflows/build.yaml+3−3
@@ -60,7 +60,7 @@ jobs:
6060 - name: Common setup
6161 uses: ./.github/actions/common_setup
6262 with:
63− cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
63+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
6464 - name: Build
6565 run: nix-build -A projectCross.musl64.hsPkgs.octo-cli.components.exes.octo --arg prod true -j auto
6666 - uses: actions/upload-artifact@v2
@@ -77,7 +77,7 @@ jobs:
7777 - name: Common setup
7878 uses: ./.github/actions/common_setup
7979 with:
80− cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
80+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
8181
8282 - name: Build Docker Images
8383 run: nix-build ./nix -j auto
@@ -116,7 +116,7 @@ jobs:
116116 - name: Common setup
117117 uses: ./.github/actions/common_setup
118118 with:
119− cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
119+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
120120 - name: Push Docker Release Images to DockerHub
121121 uses: ./.github/actions/push_docker_images
122122 with:
nix/default.nix+1−1
@@ -1,5 +1,5 @@
11{ sources ? import ./sources.nix
2−, octopod-css ? import ../octopod-css { inherit pkgsSrc; }
2+, octopod-css ? import ../octopod-css { inherit pkgsSrc system; }
33, migrations ? ../migrations
44, system ? builtins.currentSystem
55, hsPkgs ? import ./.. { inherit system prod; }
octopod-css/default.nix+2
@@ -1,10 +1,12 @@
11{ pkgsSrc ? (import ./.. { }).pkgsSrc
22, sources ? import ../nix/sources.nix
33, nix-filter ? import sources.nix-filter
4+, system ? builtins.currentSystem
45}:
56let
67 pkgs = pkgsSrc {
78 overlays = [ (self: super: { nodejs = self.nodejs-10_x; }) ];
9+ inherit system;
810 };
911 production-css = pkgs.mkYarnPackage {
1012 name = "octopod-css";