From 0a4b64dc255779b4cededf451d0b6ee2b2ac738f Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 23:38:57 -0500 Subject: [PATCH 1/4] add format.signoff to git config, fix git-gone Signed-off-by: ahuston-0 --- users/alice/home/git.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/users/alice/home/git.nix b/users/alice/home/git.nix index 89ef549..849bf29 100644 --- a/users/alice/home/git.nix +++ b/users/alice/home/git.nix @@ -11,15 +11,15 @@ userName = "ahuston-0"; aliases = { gone = '' - # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches - # awk '$2 == "[gone]" {print $1}' | # get nuked branches - # sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons - # xargs -r git branch -D; # nuke the branches # !git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches awk 'NF < 2 {print $1}' | # get nuked branches grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons xargs -r git branch -D # nuke the branches + # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches + # awk '$2 == "[gone]" {print $1}' | # get nuked branches + # sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons + # xargs -r git branch -D; # nuke the branches # ''; }; extraConfig = { @@ -27,6 +27,7 @@ pull.rebase = true; color.ui = true; init.defaultBranch = "main"; + format.signoff = true; }; }; } -- 2.48.1 From 29a09715f9872a139b304cce02022ea1c0a069c7 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 23:42:39 -0500 Subject: [PATCH 2/4] add build checks to flake-health-checks --- .github/workflows/flake-health-checks.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index dcd7145..a80e3ba 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -25,3 +25,22 @@ jobs: - uses: actions/checkout@v4 - run: nix flake check --accept-flake-config - run: nix ./utils/attic-push.bash + build-checks: + name: "Build nix outputs" + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + steps: + - uses: DeterminateSystems/nix-installer-action@main + - name: Setup Attic cache + uses: ryanccn/attic-action@v0 + with: + endpoint: ${{ secrets.ATTIC_ENDPOINT }} + cache: ${{ secrets.ATTIC_CACHE }} + token: ${{ secrets.ATTIC_TOKEN }} + skip-push: "true" + - uses: actions/checkout@v4 + - name: Build all outputs + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . + - run: nix ./utils/attic-push.bash -- 2.48.1 From 371dfbaf3b97765ac0134b073a842ad4a3855cda Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 23:53:34 -0500 Subject: [PATCH 3/4] fix collabora secrets --- systems/palatine-hill/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml index 811586c..d808323 100644 --- a/systems/palatine-hill/secrets.yaml +++ b/systems/palatine-hill/secrets.yaml @@ -21,7 +21,7 @@ docker: nextcloud: ENC[AES256_GCM,data:dm2Cha+CvFORgdcBvJAzzdOGcJ95vLJYTZcUJnjNp6HOQIIoJrDone1NOAYJh9rdWG/17/ntOmd+TysAj4AsD0dw/PatZmy3I+dcVghkt2XNTc7jD64QjctIHzR+om1joAbKemG1R3St7qDU68TWYxoxIfYZcJvg3ds/lJcYgFRh079UZ/IRlGVR6sWPEXyY+UUrwtk0Fr+y8UtwwWZiLp0akUbIV06huRGiAp/PeWETuPPuacl2++ayIgJFZkJjUl/a52RI1Q0nLG5iyK6QYpY1JSRJTOkiQQ4PB5GRdLCdoM5/ZXTQ6gGcoM5jXFllsTn+yRicNRucuBp7Z2achbk6eITCdjjdXVI7zM4YXpzVLu5fJckLAu07aEIGYCBT7ZXd7TRgfB68POwtwaJGBozg+nuhq8xEH04yi8jFODH6aFplIgJ+bbaP72zw+92lzZa33FEtOwKdtx+YUv0eLLDJs+8Z6Sn6RyN8prwIz1/9LuIMx39g4R7id9W2bV2MXqTU4nN8f0TXWqe+hnb5pDLBaZOBMkwbRka6Vptsi4dbL5Lnexa2DoIHZ2unyxZ+4SkRt9LH39j8fXf2w5JPFCSLstf7+Zu7xzRS0TTCug7k,iv:oOWcFdQJb/+KZKJmQChhJ5jOCcM3o+ojZSMyiRnO9n8=,tag:PWGQkwPe0juLgAdlKiWKpg==,type:str] redis: ENC[AES256_GCM,data:c+55cN6IpUNeKd+wC2zv3eunYjBsmZtXTczokqaxB2Q=,iv:M3pwNUlT9kUMv4JDE6bp/gub9CdBGxdApIvpOt3JpgE=,tag:3rPlV3U0AP9zAeF7xDouKw==,type:str] act-runner: ENC[AES256_GCM,data:gdrqXBBzdMW26MgNfP6P1c/m7pLANCXjcZLvVsxlWcgpAZd8IaO2FUqomL3xFI3UDPveQh0UvC3044ueoWhYJOq7ZmKJGvdf0ZrpP1MkXZKvjFjbTsuf/6/SYKhPqnP28HqznUWIVJYcRmP+A2oVeJY=,iv:/yOqJYDpxbqCm1whqcypp7Ba1Xlaebrv+h6lHr57Qa8=,tag:PzVqxP+QwQq69jqhmagj3w==,type:str] - collabora: ENC[AES256_GCM,data:r+BcGh3XNAEIB2VlSEf1wyVXNgO/QOV5KgqnYg5Sh4Uv4nyBmgkFBkZlM57WDkNnTQdwg7JUlFxHwBiGLw2v/MOL6czEEBdIVfD36hls0Z/34cerRxAesEQSp7ixTegItt8Z52mkUKsblSFlQW80JKbm2mTNVInY,iv:wS29mU/mPbgHuCIrGVwyh8om8UeBZG+vNHrfUPv2of0=,tag:/N8g7IuNVrGA7yiPuWxwbQ==,type:str] + collabora: ENC[AES256_GCM,data:LPRkzPEv5qfzeWSDbf+L+0asfmiK5Mhj8jCdfVyvVQAaD75Cbo4qLD0Nc80z,iv:/l2vAyYYJChhv6T+JkHT4I74ZpdhvbVqxlDWIM4Y4bw=,tag:/+uzn1vtd1RnO9/lGiQAKA==,type:str] acme: bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str] dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str] @@ -42,8 +42,8 @@ sops: cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-02T22:12:04Z" - mac: ENC[AES256_GCM,data:bRjvsFSSZFHCdy6PWKyIDbNiCvfF6QbIGnBGQC+6xGt3EQW3Tjm7zHOxYDlI61/l+tIb+pH6/dP/HC3o/2qC2S1s4DQj+1oap8z3qcWpfya/yrzp9cr0l0LxO9PxneSWV5BD8msoJ4I4jDLoWAHkmS5i7DWV2Ye7qBFfEUX1PrM=,iv:HQhxTkXZepIud38YaHFLOs5nemggiVDoZ1AN+b2eEZ8=,tag:ZQAPpDZiYBxmOc8GXheUvA==,type:str] + lastmodified: "2025-03-04T04:53:14Z" + mac: ENC[AES256_GCM,data:MCucwVPGRMA/hGYS7mwSppkZAQ3wjHJnyeSvSI8YOOD0Xq7mvkMSvKctFHl6h4Cx3ubRvVHf5j35/NQxb+/VhhCPAHWDbqq9O2N0aWhAeybCu0IjruKrJhs76KsXJnNZ9REQQnS1/TNquuvj9FCoqDnrQcFs7M0KJ5m3eUU2h2k=,iv:ZJGJ8CTA8K5FnoKtbogleksB8wDcZtknO07M07Dmpsc=,tag:GMUXJD4U8KQgy9rvzEAMuw==,type:str] pgp: - created_at: "2024-11-28T18:56:39Z" enc: |- -- 2.48.1 From 00b665c10c94ba47d2ae44a4cd525bc4befcd754 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 4 Mar 2025 00:11:04 -0500 Subject: [PATCH 4/4] add continue-on-error to attic push --- .github/workflows/flake-health-checks.yml | 4 +++- .github/workflows/flake-update.yml | 4 ++++ .github/workflows/nix-fmt.yml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml index a80e3ba..4035df0 100644 --- a/.github/workflows/flake-health-checks.yml +++ b/.github/workflows/flake-health-checks.yml @@ -43,4 +43,6 @@ jobs: - uses: actions/checkout@v4 - name: Build all outputs run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . - - run: nix ./utils/attic-push.bash + - name: Push to Attic + run: nix ./utils/attic-push.bash + continue-on-error: true diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index cb286a5..d5d6250 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -27,6 +27,7 @@ jobs: endpoint: ${{ secrets.ATTIC_ENDPOINT }} cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} + skip-push: "true" - name: Calculate pre-drv run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build . # - name: Pull latest docker images @@ -138,6 +139,9 @@ jobs: branch: update-flake-lock delete-branch: true + - name: Push to Attic + run: nix ./utils/attic-push.bash + continue-on-error: true - name: Print PR number run: | echo "Pull request number is ${{ steps.create-pull-request.outputs.pull-request-number }}." diff --git a/.github/workflows/nix-fmt.yml b/.github/workflows/nix-fmt.yml index e2c2e3e..189148d 100644 --- a/.github/workflows/nix-fmt.yml +++ b/.github/workflows/nix-fmt.yml @@ -18,5 +18,9 @@ jobs: endpoint: ${{ secrets.ATTIC_ENDPOINT }} cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} + skip-push: "true" - uses: actions/checkout@v4 - run: nix fmt -- --check . + - name: Push to Attic + run: nix ./utils/attic-push.bash + continue-on-error: true -- 2.48.1