From f8ae558738d1b2639a68661b6d516a7844baab57 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Wed, 18 Nov 2020 13:15:33 -0500 Subject: [PATCH] fix --- .github/workflows/nix.yml | 5 +---- scripts/release.sh | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 096c869..ab5e46a 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -27,11 +27,8 @@ jobs: docker push ghcr.io/xe/site - name: deploy if: github.ref == 'refs/heads/main' - run: | - nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs - ./scripts/release.sh + run: ./scripts/release.sh env: - NIX_PATH: /nix/var/nix/profiles/per-user/runner/channels DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} MI_TOKEN: ${{ secrets.MI_TOKEN }} PATREON_ACCESS_TOKEN: ${{ secrets.PATREON_ACCESS_TOKEN }} diff --git a/scripts/release.sh b/scripts/release.sh index 9510d39..57f4eaf 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,5 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -p doctl -p kubectl -p curl -i bash +#! nix-shell -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable + nix-env -if ./nix/dhall-yaml.nix doctl kubernetes cluster kubeconfig save kubermemes dhall-to-yaml-ng < ./site.dhall | kubectl apply -n apps -f -