From 0a3e2e1e67d83b8388fc95789b24490e9a8efd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 10 Apr 2023 09:17:29 +0100 Subject: [PATCH] Fix update script --- .woodpecker/update.yaml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.woodpecker/update.yaml b/.woodpecker/update.yaml index 24eb600..593a66e 100644 --- a/.woodpecker/update.yaml +++ b/.woodpecker/update.yaml @@ -1,4 +1,14 @@ pipeline: + clone2: + image: nixery.dev/shell/gitfull + commands: + - cd .. + - rm -rf $CI_REPO_NAME + - git clone https://git.chir.rs/$CI_REPO_OWNER/$CI_REPO_NAME + - cd $CI_REPO_NAME + when: + - event: cron + - event: manual flake-update: image: nixpkgs/nix-unstable commands: @@ -14,7 +24,7 @@ pipeline: builders-use-substitutes = true require-sigs = true sandbox = false - substituters = https://attic.chir.rs/chir-rs/ https://cache.nixos.org/ + substituters = https://hydra.int.chir.rs/ https://cache.nixos.org/ system-features = big-parallel benchmark ca-derivations trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs= chir-rs:AnwyFacopHSkprD6aXY4/R3J9JYzTbV2rosJCBPaB28= trusted-substituters = @@ -40,7 +50,7 @@ pipeline: builders-use-substitutes = true require-sigs = true sandbox = false - substituters = https://attic.chir.rs/chir-rs/ https://cache.nixos.org/ + substituters = https://hydra.int.chir.rs/ https://cache.nixos.org/ system-features = big-parallel benchmark ca-derivations trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs= chir-rs:AnwyFacopHSkprD6aXY4/R3J9JYzTbV2rosJCBPaB28= trusted-substituters = @@ -68,7 +78,7 @@ pipeline: - chmod 600 ~/.ssh/id_ed25519 - echo "git.chir.rs ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQ77jA9S5qXDFGPLZRsC++AtxiXXeF8gVbkLlglx0GQ" > ~/.ssh/known_hosts - echo "git.chir.rs ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY0pZzNTAqaVqqfC31gYFixFs5KySv0UqvlDEAzEXJMB/pBWkE5GAd5Ik1NxD4QiAVWc2UARdmJEBbYf8mk5JiAv6fjsodJdJVRau4Ax7FtIfbxdFyzBgFery/KUnNIr6cmAWU2Af8JhzrnpEbhe5U3LftYnkdE1lI+iVqaQRARp0qikdzoAl3uMUhbdTxp1/6rtfN6bP2XZCsUx3t3W5ZG1QTQz8l7nrbXZX1TT3pZ2vcUANcMtOxEAwO6lbL210GX63C8XEoE7+4lLxRrSiaq3SkVlG07VspozKEtrrcsqCRNLebiaapmNWVoEq9Wd9VGAEjja5efyU6/HUlRogAOo1WP73UwoQLv5LTFH+ECoHhKS14xfPeXeVG8dbYyh5+CnmiVe43dH1qZw+ceYuYel31f47cAgScbxFvNkct0spK9m9mivnoUmYcxwTc+VbFbmnJvSuZw3a+OEYn9biitP/tTkYFiLZVdPZTxDkvd1oOyuVH9d4RMXbVgNS92/lr2iKFZkyhWMJ61hFMc2tupwmkp5Us5ce42XA0zC/aVY3vYoih/c5Ib0eZF1AEJdB6Bt5dWqITVsB3mip3Jn/mqVBIPTGXT6+FnGSEuL68Dj2yKBD7kj8YO/1SWpkVMy+bfoLXY/usgcaLCxpUu8dDrdrcKExLigCVbi3rdRmg7w==" >> ~/.ssh/known_hosts - - git remote set-url origin gitea@git.chir.rs:darkkirb/nix-packages.git + - git remote set-url origin gitea@git.chir.rs:$CI_REPO_OWNER/$CI_REPO_NAME.git - git config --global 'user.email' 'gitea-bot@chir.rs' - git config --global 'user.name' 'Gitea Bot' - echo "$GPG_KEY" | gpg --import @@ -87,10 +97,9 @@ pipeline: image: nixery.dev/shell/curl commands: - | - echo '{ "assignee": "darkkirb", "base": "main", "head": "update-flake, "title": "Update flake", "body": "" }' | curl -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/json" --data-binary @- 'https://git.chir.rs/api/v1/repos/darkkirb/nix-packages/pulls' + echo '{ "assignee": "darkkirb", "base": "main", "head": "update-flake", "title": "Update flake", "body": "" }' | curl -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/json" --data-binary @- "https://git.chir.rs/api/v1/repos/$CI_REPO_OWNER/$CI_REPO_NAME/pulls" secrets: - gitea_token when: - event: cron - event: manual -branches: main