From d541aff6b3dded95adb92bd50d247a9cb8cf720c Mon Sep 17 00:00:00 2001 From: Truxnell <9149206+truxnell@users.noreply.github.com> Date: Wed, 27 Mar 2024 08:17:24 +1100 Subject: [PATCH 1/2] fix: dry run for builds as i use garnix for cache --- .github/workflows/diff-pr.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/diff-pr.yaml b/.github/workflows/diff-pr.yaml index 93f113e..66f4620 100644 --- a/.github/workflows/diff-pr.yaml +++ b/.github/workflows/diff-pr.yaml @@ -57,12 +57,12 @@ jobs: run: nix-collect-garbage - name: Fetch old system profile - run: nix build github:truxnell/nix-config#top.${{ matrix.target }} -v --log-format raw --profile ./profile + run: nix build github:truxnell/nix-config#top.${{ matrix.target }} -v --dry-run --log-format raw --profile ./profile - name: Add new system to profile run: | set -o pipefail - nix build .#top.${{ matrix.target }} --profile ./profile --show-trace --fallback -v --log-format raw > >(tee stdout.log) 2> >(tee /tmp/nix-build-err.log >&2) + nix build .#top.${{ matrix.target }} --dry-run --profile ./profile --show-trace --fallback -v --log-format raw > >(tee stdout.log) 2> >(tee /tmp/nix-build-err.log >&2) - name: Output build failure if: failure() @@ -107,10 +107,8 @@ jobs: message: | ### Report for `${{ matrix.target }}` - Version changes ${{ steps.diff.outputs.diff }} - Security vulnerability report From 86286961f7c6dd1ee583f4e52a87d3f3ff5d7d5f Mon Sep 17 00:00:00 2001 From: Truxnell <9149206+truxnell@users.noreply.github.com> Date: Wed, 27 Mar 2024 08:28:53 +1100 Subject: [PATCH 2/2] fix: nuke default renovate --- .github/renovate.json | 3 --- renovate.json | 6 ------ 2 files changed, 9 deletions(-) delete mode 100644 renovate.json diff --git a/.github/renovate.json b/.github/renovate.json index eb02204..b85454a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,9 +3,6 @@ "extends": [ "github>truxnell/renovate-config", "github>truxnell/renovate-config:automerge-github-actions", - "github>aquaproj/aqua-renovate-config#2.2.0", - "github>aquaproj/aqua-renovate-config:installer-script#2.2.0(install-aqua\\.sh)", - "github>aquaproj/aqua-renovate-config:file#2.2.0(^aqua/.*\\.ya?ml$)" ], "platform": "github", "username": "trux-bot[bot]", diff --git a/renovate.json b/renovate.json deleted file mode 100644 index e2be58e..0000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "local>truxnell/renovate-config" - ] -}
${{ steps.diff.outputs.diff }}