fix ci #200

Merged
v merged 12 commits from ci into main 2023-09-09 16:18:16 +02:00
6 changed files with 29 additions and 9 deletions

View file

@ -4,9 +4,19 @@ on: [push]
jobs: jobs:
lint: lint:
runs-on: native runs-on: docker
env:
container:
image: ghcr.io/catthehacker/ubuntu:js-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: statix check . - uses: https://github.com/cachix/install-nix-action@v22
- run: deadnix -f env:
- run: yamllint . with:
nix_path: nixpkgs=channel:nixos-unstable
- run: |
sed -i '/^access-tokens/ d' /etc/nix/nix.conf
nix profile install 'nixpkgs#deadnix' 'nixpkgs#statix' 'nixpkgs#yamllint'
statix check .
deadnix -f
yamllint .

View file

@ -1,5 +1,7 @@
name: Nix name: Nix
# on: [push]
jobs: jobs:
lint: lint:
runs-on: docker runs-on: docker
@ -8,7 +10,7 @@ jobs:
image: ghcr.io/catthehacker/ubuntu:js-20.04 image: ghcr.io/catthehacker/ubuntu:js-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: https://github.com/cachix/install-nix-action@v20 - uses: https://github.com/cachix/install-nix-action@v22
env: env:
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable

View file

@ -10,9 +10,14 @@ on:
jobs: jobs:
update: update:
runs-on: native runs-on: docker
container:
image: ghcr.io/catthehacker/ubuntu:js-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: https://github.com/cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-unstable
- env: - env:
VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}

View file

@ -20,6 +20,7 @@ in {
inputs.comma.packages.${pkgs.system}.default inputs.comma.packages.${pkgs.system}.default
inputs.webcord.packages.${pkgs.system}.default inputs.webcord.packages.${pkgs.system}.default
kdenlive kdenlive
mattermost-desktop
mullvad-vpn mullvad-vpn
neofetch neofetch
nixfmt nixfmt

View file

@ -69,8 +69,8 @@ in {
"REPO_INDEXER_EXCLUDE" = "node_modules/**"; "REPO_INDEXER_EXCLUDE" = "node_modules/**";
}; };
ui = { ui = {
"THEMES" = "gitea,arc-green,agatheme"; "THEMES" = "forgejo-auto,forgejo-light,forgejo-dark,auto,gitea,arc-green,agatheme";
"DEFAULT_THEME" = "agatheme"; "DEFAULT_THEME" = "forgejo-auto";
"USE_SERVICE_WORKER" = true; "USE_SERVICE_WORKER" = true;
}; };
server = { server = {

View file

@ -1,4 +1,6 @@
#! /usr/bin/env bash #! /usr/bin/env nix-shell
#! nix-shell -i bash -p vault curl jq
shopt -s extglob shopt -s extglob
set -eu -o pipefail set -eu -o pipefail