update gha setup

This commit is contained in:
Daylin Morgan 2024-12-27 15:39:26 -06:00
parent aebdd1f765
commit a71feaeeae
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 5 additions and 76 deletions

View file

@ -9,18 +9,6 @@ inputs:
experimental-features = pipe-operator
keep-derivations = true
keep-outputs = true
# key:
# description: Key to actions/cache
# default: nix
# install_action:
# description: Set `nixbuild` to use nixbuild/nix-quick-install-action, otherwide use cachix/install-nix-action
# default: nixbuild
# use_nixpkgs_in_flake:
# description: Use nixpkgs defined in flake.nix
# default: true
# nixpkgs_url:
# description: Nixpkgs URL
# default: https://nixos.org/channels/nixos-24.05
clean:
description: Clean up disk space
default: false
@ -29,12 +17,7 @@ inputs:
default: false
attic_token:
description: token to access attic cache
# debug:
# description: Enable debug
# default: false
# debug_token:
# default: ${{ github.token }}
# description: Set github token for gh cli
runs:
using: composite
steps:
@ -54,35 +37,3 @@ runs:
run: |
nix profile install "nixpkgs#attic-client"
attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}"
# - name: Nix restore pre
# shell: bash
# env:
# CACHE_KEY: ${{ inputs.key }}
# run: exec ${{ github.action_path }}/restore.sh pre
# - uses: actions/cache/restore@v4
# with:
# key: ${{ env.CACHE_KEY }}-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_TIMESTAMP }}
# restore-keys: |
# ${{ env.CACHE_KEY }}-${{ runner.os }}-${{ runner.arch }}
# path: |
# /nix/store
# /nix/var/nix/db
# /nix/var/nix/gcroots
# /nix/var/nix/profiles
# ~/.cache/nix
# ~/.local/state/nix
# ~/.nix-channels
# ~/.nix-defexpr
# - name: Nix restore post
# shell: bash
# env:
# USE_NIXPKGS_IN_FLAKE: ${{ inputs.use_nixpkgs_in_flake }}
# NIXPKGS_URL: ${{ inputs.nixpkgs_url }}
# run: exec ${{ github.action_path }}/restore.sh post
# - name: Debug
# if: ${{ inputs.debug == true || inputs.debug == 'true' || inputs.debug == 'nopause' }}
# shell: bash
# env:
# GH_TOKEN: ${{ inputs.debug_token }}
# run: exec ${{ github.action_path }}/debug.sh "${{ inputs.debug }}"

View file

@ -1,13 +1,12 @@
name: Build NixOS (on demand)
# TODO: accept , style sep in hwylcli
on:
workflow_dispatch:
inputs:
hosts:
description: 'list of hosts to build'
required: true
default: ',othalan,algiz'
default: 'othalan,algiz'
type: string
lockFile:
description: 'flake.lock file'
@ -20,9 +19,9 @@ on:
default: ',othalan,algiz'
type: string
# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }}
# cancel-in-progress: true
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }}
cancel-in-progress: true
jobs:
build:
@ -31,13 +30,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
# needed to access ghostty repo for now
- name: Setup SSH
uses: MrSquaare/ssh-setup-action@v3
with:
host: github.com
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: ./.github/actions/nix
with:
attic_token: ${{ secrets.ATTIC_TOKEN }}

View file

@ -30,13 +30,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
# needed to access ghostty repo for now
- name: Setup SSH
uses: MrSquaare/ssh-setup-action@v3
with:
host: github.com
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: daylin-bot/actions/setup@main
- uses: ./.github/actions/nix
with:
@ -82,13 +75,6 @@ jobs:
with:
fetch-depth: 0
# needed to access ghostty repo for now
- name: Setup SSH
uses: MrSquaare/ssh-setup-action@v3
with:
host: github.com
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: daylin-bot/actions/setup@main
- uses: ./.github/actions/nix
with: