Skip to content

Implement git alias to bulk resolve conflict #1164

Implement git alias to bulk resolve conflict

Implement git alias to bulk resolve conflict #1164

Workflow file for this run

# https://github.com/NixOS/nixos-artwork/blob/35ebbbf01c3119005ed180726c388a01d4d1100c/logo/README.md#L5
name: ❄️
on:
push:
branches: [main]
paths:
- '.github/workflows/ci-nix.yml'
- '**.nix'
- 'flake.*'
- 'Makefile.toml'
pull_request:
paths:
- '.github/workflows/ci-nix.yml'
- '**.nix'
- 'flake.*'
- 'Makefile.toml'
schedule:
# Every 10:42 JST
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
- cron: '42 1 * * *'
workflow_dispatch:
jobs:
tasks:
if: (github.event_name != 'pull_request') || (!github.event.pull_request.draft)
strategy:
fail-fast: false
matrix:
os:
- ubuntu-24.04
- macos-14 # M1. Doesn't match for my Intel Mac, but preferring with the speed.
runs-on: ${{ matrix.os }}
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v13
- name: Print some dotfiles overviews
run: |
</etc/nix/nix.conf
ls -alh ~
- uses: DeterminateSystems/magic-nix-cache-action@v7
- run: nix develop --command echo 'This step should be done before any other "nix develop" steps because of measuring Nix build time'
- run: nix flake show
- run: nix flake check
# https://github.com/kachick/dotfiles/pull/718#issuecomment-2266331003
if: runner.os == 'Linux'
- run: nix develop --command makers ci-dev