Use new cachix (#162)

* Use new cachix

* set auth key

* Add system to css assets
This commit is contained in:
iko 2022-02-17 15:58:54 +03:00 committed by GitHub
parent 5c7956ccae
commit ebdcb8886a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions

View File

@ -1,8 +1,8 @@
name: "Common setup"
description: "Common setup steps"
inputs:
cachixSigningKey:
description: "Cachix signing key"
authToken:
description: "Cachix auth token"
required: true
runs:
using: "composite"
@ -36,5 +36,5 @@ runs:
- name: Login to Cachix
uses: cachix/cachix-action@v10
with:
name: octopod
signingKey: ${{ inputs.cachixSigningKey }}
name: typeable
authToken: ${{ inputs.authToken }}

View File

@ -60,7 +60,7 @@ jobs:
- name: Common setup
uses: ./.github/actions/common_setup
with:
cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Build
run: nix-build -A projectCross.musl64.hsPkgs.octo-cli.components.exes.octo --arg prod true -j auto
- uses: actions/upload-artifact@v2
@ -77,7 +77,7 @@ jobs:
- name: Common setup
uses: ./.github/actions/common_setup
with:
cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Build Docker Images
run: nix-build ./nix -j auto
@ -116,7 +116,7 @@ jobs:
- name: Common setup
uses: ./.github/actions/common_setup
with:
cachixSigningKey: ${{ secrets.CACHIX_SIGNING_KEY }}
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Push Docker Release Images to DockerHub
uses: ./.github/actions/push_docker_images
with:

View File

@ -1,5 +1,5 @@
{ sources ? import ./sources.nix
, octopod-css ? import ../octopod-css { inherit pkgsSrc; }
, octopod-css ? import ../octopod-css { inherit pkgsSrc system; }
, migrations ? ../migrations
, system ? builtins.currentSystem
, hsPkgs ? import ./.. { inherit system prod; }

View File

@ -1,10 +1,12 @@
{ pkgsSrc ? (import ./.. { }).pkgsSrc
, sources ? import ../nix/sources.nix
, nix-filter ? import sources.nix-filter
, system ? builtins.currentSystem
}:
let
pkgs = pkgsSrc {
overlays = [ (self: super: { nodejs = self.nodejs-10_x; }) ];
inherit system;
};
production-css = pkgs.mkYarnPackage {
name = "octopod-css";