From a1bee61f7a2f374977afbabe328ae5e1bd40d5bf Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 03:36:45 -0500 Subject: [PATCH 01/10] Update workflow actions --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91798b3..c3bbab5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,13 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Check Nix flake inputs - uses: DeterminateSystems/flake-checker-action@v5 + uses: DeterminateSystems/flake-checker-action@v8 - name: Install Nix - uses: cachix/install-nix-action@v26 + uses: cachix/install-nix-action@v27 + - name: Setup Cachix + uses: cachix/cachix-action@v15 with: - extra_nix_config: | - substituters = https://cache.nixos.org https://devenv.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= + name: devenv - name: Build configuration run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} timeout-minutes: 5 From 95ee05bf4e0252f5fd4e30a81e5561f5d7a1d5dd Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 03:37:49 -0500 Subject: [PATCH 02/10] Rename CI workflow --- .github/workflows/{build.yml => ci.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{build.yml => ci.yml} (98%) diff --git a/.github/workflows/build.yml b/.github/workflows/ci.yml similarity index 98% rename from .github/workflows/build.yml rename to .github/workflows/ci.yml index c3bbab5..4e1b3ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ --- -name: build +name: CI on: push From f9905b12fe089d20432b8359da77e50f3c9e8fe7 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 03:47:10 -0500 Subject: [PATCH 03/10] Add extension to home-manager build command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e1b3ed..704af62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: name: devenv - name: Build configuration - run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} + run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} -b bak timeout-minutes: 5 - name: Activate the configuration run: ./result/activate From 864be66184892d94b24e716382d83537ae15c6e3 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 03:58:33 -0500 Subject: [PATCH 04/10] Pass the right argument to `activate` --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 704af62..f47ed99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: name: devenv - name: Build configuration - run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} -b bak + run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} timeout-minutes: 5 - name: Activate the configuration - run: ./result/activate + run: ./result/activate -b bak From 3b8da738782c4f5bea3bc486be11bb4477b35745 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 04:12:33 -0500 Subject: [PATCH 05/10] Use switch instead of build --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f47ed99..2469e4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,6 @@ jobs: uses: cachix/cachix-action@v15 with: name: devenv - - name: Build configuration - run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} + - name: Build and activate configuration + run: nix run home-manager/release-24.05 -- switch --flake ${{ github.workspace }} -b bak timeout-minutes: 5 - - name: Activate the configuration - run: ./result/activate -b bak From 9f3eed385cbec72b6bd61f1a2c5c37189bb7540f Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:22:41 -0500 Subject: [PATCH 06/10] Change switch with build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2469e4e..f71777a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,5 +22,5 @@ jobs: with: name: devenv - name: Build and activate configuration - run: nix run home-manager/release-24.05 -- switch --flake ${{ github.workspace }} -b bak + run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} timeout-minutes: 5 From 927708a192c9d2022fcdddc610752f6f710fee25 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:25:03 -0500 Subject: [PATCH 07/10] Remove file that conflicts with home-manager --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f71777a..263bc98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,10 @@ jobs: uses: cachix/cachix-action@v15 with: name: devenv - - name: Build and activate configuration + - name: Build configuration run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} timeout-minutes: 5 + - name: Activate the configuration + run: | + rm ~/.config/nix/nix.conf + ./result/activate From b0394cfb71f1d7959963d4bb99af86cd81bdf5a3 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:33:36 -0500 Subject: [PATCH 08/10] Remove activate step --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 263bc98..ca8638f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,3 @@ jobs: - name: Build configuration run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} timeout-minutes: 5 - - name: Activate the configuration - run: | - rm ~/.config/nix/nix.conf - ./result/activate From a1a32ab0b5a01d0a0282521a4e864657c9930bfc Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:34:33 -0500 Subject: [PATCH 09/10] Update status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e902be7..52683a8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Home Manager Configuration -[![build](https://github.com/sestrella/home-manager.config/actions/workflows/build.yml/badge.svg)](https://github.com/sestrella/home-manager.config/actions/workflows/build.yml) +[![CI](https://github.com/sestrella/home-manager.config/actions/workflows/ci.yml/badge.svg)](https://github.com/sestrella/home-manager.config/actions/workflows/ci.yml) My [Home Manager](https://github.com/nix-community/home-manager) configuration. From 607d94164018479367c2b1f29d17834bd4e2cd53 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:34:47 -0500 Subject: [PATCH 10/10] Update concurrency group name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca8638f..30eb03c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ name: CI on: push concurrency: - group: build-${{ github.ref }} + group: ci-${{ github.ref }} cancel-in-progress: true jobs: