From 9630a1cee1cb6839244504228e4b13b0f9088cca Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 11:24:28 -0500 Subject: [PATCH 1/2] integrate flake-update-diff --- .github/workflows/flake-update.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 394ce9d..9a1f7aa 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -28,23 +28,23 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - name: Calculate pre-drv - run: nix ./utils/eval-to-drv.sh pre + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff --keep-hydra . # - name: Pull latest docker images # run: nix ./utils/fetch-docker.sh - name: Update flake.lock (part 1) run: nix flake update - name: Calculate post-drv - run: nix ./utils/eval-to-drv.sh post - - name: Calculate diff - run: nix ./utils/diff-evals.sh - - name: Read diff into environment - run: | - delimiter="$(openssl rand -hex 8)" - { - echo "POSTDIFF<<${delimiter}" - cat post-diff - echo "${delimiter}" - } >> $GITHUB_ENV + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff --keep-hydra . + # - name: Calculate diff + # run: nix ./utils/diff-evals.sh + # - name: Read diff into environment + # run: | + # delimiter="$(openssl rand -hex 8)" + # { + # echo "POSTDIFF<<${delimiter}" + # cat post-diff + # echo "${delimiter}" + # } >> $GITHUB_ENV - name: Restore flake.lock for next step -- 2.48.1 From 2840665f21499748f155fc756a6dfad2f8955df0 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 11:25:12 -0500 Subject: [PATCH 2/2] remove limit on ref --- .github/workflows/flake-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 9a1f7aa..a1de978 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -7,7 +7,7 @@ on: jobs: createPullRequest: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' # ensure workflow_dispatch only runs on main + # if: github.ref == 'refs/heads/main' # ensure workflow_dispatch only runs on main steps: - uses: actions/checkout@v4 # - name: Login to Docker Hub -- 2.48.1