From a4ec703bae797e5f3cf4fe1549a847d086c27023 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 15:43:08 -0500 Subject: [PATCH 01/35] tsuru: enable woodpecker --- hosts/tsuru/services/default.nix | 2 +- hosts/tsuru/services/tailscale.nix | 43 +++++++++++++++++++++++++++++ hosts/tsuru/services/woodpecker.nix | 38 +++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 hosts/tsuru/services/tailscale.nix create mode 100644 hosts/tsuru/services/woodpecker.nix diff --git a/hosts/tsuru/services/default.nix b/hosts/tsuru/services/default.nix index 95d74d2..f811024 100644 --- a/hosts/tsuru/services/default.nix +++ b/hosts/tsuru/services/default.nix @@ -1,5 +1,5 @@ _: { imports = [ - ./forgejo-runners.nix + ./woodpecker.nix ]; } diff --git a/hosts/tsuru/services/tailscale.nix b/hosts/tsuru/services/tailscale.nix new file mode 100644 index 0000000..798440a --- /dev/null +++ b/hosts/tsuru/services/tailscale.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: { + sops.secrets.tsauth-tsuru = { + sopsFile = ../../../secrets/tailscale/secrets.yaml; + }; + environment.systemPackages = [pkgs.jq pkgs.tailscale]; + services.tailscale = { + useRoutingFeatures = lib.mkDefault "client"; + }; + networking.firewall.allowedUDPPorts = [config.services.tailscale.port]; + networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName]; + + systemd.services.tailscale-autoconnect = { + description = "Automatic connection to Tailscale"; + + # make sure tailscale is running before trying to connect to tailscale + after = ["network-pre.target" "tailscale.service"]; + wants = ["network-pre.target" "tailscale.service"]; + wantedBy = ["multi-user.target"]; + + # set this service as a oneshot job + serviceConfig.Type = "oneshot"; + + # have the job run this shell script + script = with pkgs; '' + # wait for tailscaled to settle + sleep 2 + + # check if we are already authenticated to tailscale + status="$(${tailscale}/bin/tailscale status -json | ${jq}/bin/jq -r .BackendState)" + if [ $status = "Running" ]; then # if so, then do nothing + exit 0 + fi + + # otherwise authenticate with tailscale + ${tailscale}/bin/tailscale up -authkey file:${config.sops.secrets.tsauth-tsuru.path} --exit-node=100.104.42.96 --exit-node-allow-lan-access=true --accept-dns=false + ''; + }; +} diff --git a/hosts/tsuru/services/woodpecker.nix b/hosts/tsuru/services/woodpecker.nix new file mode 100644 index 0000000..b3fae28 --- /dev/null +++ b/hosts/tsuru/services/woodpecker.nix @@ -0,0 +1,38 @@ +{config, ...}: { + sops.secrets.woodpecker-server = {}; + sops.secrets.woodpecker-agent-secret = {}; + services.woodpecker-server = { + enable = true; + environment = { + WOODPECKER_SERVER_ADDR = ":8200"; + WOODPECKER_GRPC_ADDR = ":8300"; + WOODPECKER_HOST = "https://ci.flake.sh"; + WOODPECKER_OPEN = "false"; + WOODPECKER_GITEA = "true"; + WOODPECKER_GITEA_URL = "https://git.flake.sh"; + WOODPECKER_ADMIN = "notohh"; + WOODPECKER_AGENT_SECRET = config.sops.secrets.woodpecker-agent-secret.path; + WOODPECKER_LOG_LEVEL = "debug"; + WOODPECKER_DEBUG_PRETTY = "true"; + WOODPECKER_KEEPALIVE_MIN_TIME = "10s"; + }; + environmentFile = config.sops.secrets.woodpecker-server.path; + }; + + services.woodpecker-agents.agents.nix = { + enable = true; + environment = { + DOCKER_HOST = "unix:///var/run/docker.sock"; + WOODPECKER_BACKEND = "docker"; + WOODPECKER_SERVER = "localhost:8300"; + WOODPECKER_AGENT_SECRET = config.sops.secrets.woodpecker-agent-secret.path; + WOODPECKER_LOG_LEVEL = "debug"; + WOODPECKER_DEBUG_PRETTY = "true"; + WOODPECKER_KEEPALIVE_MIN_TIME = "10s"; + WOODPECKER_HEALTHCHECK = "true"; + }; + extraGroups = [ + "docker" + ]; + }; +} From 6d61cd1d089f1c9afa12550a4f2b7aacdc3f2da6 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 15:44:35 -0500 Subject: [PATCH 02/35] ci: init woodpecker --- .forgejo/workflows/check.yml | 16 ---------- .../workflows/deployment/deploy-systems.yml | 31 ------------------- .forgejo/workflows/fmt.yml | 16 ---------- .woodpecker/checks.yml | 11 +++++++ .woodpecker/deploy.yml | 0 .woodpecker/flake-lock-update.yml | 0 6 files changed, 11 insertions(+), 63 deletions(-) delete mode 100644 .forgejo/workflows/check.yml delete mode 100644 .forgejo/workflows/deployment/deploy-systems.yml delete mode 100644 .forgejo/workflows/fmt.yml create mode 100644 .woodpecker/checks.yml create mode 100644 .woodpecker/deploy.yml create mode 100644 .woodpecker/flake-lock-update.yml diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml deleted file mode 100644 index 462c4c7..0000000 --- a/.forgejo/workflows/check.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: flake check - -on: - push: - paths: - - "**.nix" -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: install nix action - uses: https://github.com/DeterminateSystems/nix-installer-action@v5 - with: - github-token: ${{ secrets.GH_TOKEN }} - - run: nix flake check diff --git a/.forgejo/workflows/deployment/deploy-systems.yml b/.forgejo/workflows/deployment/deploy-systems.yml deleted file mode 100644 index 9367048..0000000 --- a/.forgejo/workflows/deployment/deploy-systems.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: deploy systems - -on: - push: - paths: - - "**.lock" -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: install nix action - uses: https://github.com/DeterminateSystems/nix-installer-action@v5 - with: - github-token: ${{ secrets.GH_TOKEN }} - extra-conf: | - builders-use-substitutes = true - substituters = https://cache.flake.sh/kyasshu https://hyprland.cachix.org https://cache.nixos.org https://nix-gaming.cachix.org https://anyrun.cachix.org https://viperml.cachix.org https://nix-community.cachix.org https://cache.nixos.org/ - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= kyasshu:g1heIgCgG7M4San6nRsz/omcVQ1GTc7+zKKm3L9Co7o= hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4= anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s= viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= - - name: write private key - run: | - mkdir -p .ssh && cd .ssh - echo "$SSH_KEY" > forgejo - chmod 400 forgejo - shell: bash - env: - SSH_KEY: ${{secrets.SSH_DEPLOY_KEY}} - - name: deploy - run: | - cd .ssh - nix run github:serokell/deploy-rs -- --ssh-opts="-i forgejo -o StrictHostKeyChecking=no" --skip-checks --targets .#arashi .#kariru .#sakura .#sora .#yuki .#haru .#kaze diff --git a/.forgejo/workflows/fmt.yml b/.forgejo/workflows/fmt.yml deleted file mode 100644 index 9061539..0000000 --- a/.forgejo/workflows/fmt.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: fmt check - -on: - push: - paths: - - "**.nix" -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: install nix action - uses: https://github.com/DeterminateSystems/nix-installer-action@v5 - with: - github-token: ${{ secrets.GH_TOKEN }} - - run: nix run nixpkgs#alejandra -- -c . diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml new file mode 100644 index 0000000..72f8c83 --- /dev/null +++ b/.woodpecker/checks.yml @@ -0,0 +1,11 @@ +steps: + check: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix flake check + fmt: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix run nixpkgs#alejandra -- -c . diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml new file mode 100644 index 0000000..e69de29 diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml new file mode 100644 index 0000000..e69de29 From d0a088968e0af5fb5bac64d4bab791778d4e4f8a Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 15:47:24 -0500 Subject: [PATCH 03/35] sops: update secrets --- secrets/secrets.yaml | 6 ++++-- secrets/tailscale/secrets.yaml | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 9c68e0c..ffd2606 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -8,6 +8,8 @@ searxng-secret: ENC[AES256_GCM,data:SSvspQVRp79zJq0hzaqzuJIWFtVUoaqHGH9PXUViiXb9 smtp2go-pwd: ENC[AES256_GCM,data:03OCDnG73T8B2Q3TJLt1kg==,iv:QFI34ZoM88AuGvOwVmxsplkNKWFgwqBn1AFdHNREses=,tag:9YABs0nAh7Cx2vybuIW9sA==,type:str] minio: ENC[AES256_GCM,data:ePCaN1wRnZheBsjEcAPizfGtZskS9rPxfP1kvvQvR+i3TGfwvAx2V96k59pt5GIqvxADi/lBuc4Er1EWQkMrhxMJlN4QmgU9LFOF,iv:81GUSVYe4LL/pI4Wy0CHSYwZvWNzWRBHR+KrCPEN430=,tag:9VFazb1U1XCpImZsNKpJyw==,type:str] attic: ENC[AES256_GCM,data:/zVpQw2yYqWWLhZnFCB17YZqcZs2Fn0L37aW1vK2Gj9npsHcOqV3d3Q7SkXSd+DIh68ECEWVoEovWgflm12fwUwXcU2yWofdfgIkO1DS9+9YRtPFPDIKwSE8YQS2V0r0IjV7KFppCrUSLZ2ehMGL/qzvQNdzVla0UsUKgqS0NjY29gcxdO4N5eJlBS/7KM297ulqu3InFdBI0rnO6t2iv37xBv5SEajPOWnaLpTYsm/aIwupJmCjwHb3WFv1NkyC+QAgCgUzNiufVwuVRrLT0fF+p1qDGjYG7Q+dwd+2K8k+MqeJNLw=,iv:k1Dg7/o2zulAX0K7IpRuwkWu+dxWRQ9H1p88MBmOapo=,tag:aDIx4hmWGiFgaEhz2Gz9lw==,type:str] +woodpecker-server: ENC[AES256_GCM,data:rI6Su65xSXGwy+wI9koVi1oL4RCSr5VEf8txJohzaPQRlyg03wZZzLCe1SSzEFsivYlL5B2XKAuVdYrkW5n5/XUENwxgPwrv7Vm3ufRfItj6+44VjV1mK8STmGnzkqglY7j71uX/+aVeqQwDM8uwWHCiT89kNTSd5ebrWzjIQ01DZ/ojPRZOZBLRE0rafA==,iv:1CuaRP0d9t8WkvMbUhDTi0hn+MqVL428Bu3r/fobK40=,tag:8KlR5EWU+cdDV5oLB8hHpA==,type:str] +woodpecker-agent-secret: ENC[AES256_GCM,data:DQoIOciEqDcaUYTTYFeIocmUUFB+ASstMA0ver4QiM/1n8G3udFL0OR6QRO1wx3bAlPCD4rrfiw1vYgAFj8xFg==,iv:X4goTnTQof1+OHj8nq6VAyCe+M7p2hLa4nDvm/hXw7U=,tag:3KbuBYTqU2hD3GB3r1siZw==,type:str] sops: kms: [] gcp_kms: [] @@ -23,8 +25,8 @@ sops: YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt 5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-16T06:46:14Z" - mac: ENC[AES256_GCM,data:QIKiP/3+VNhKe9Pz2F9EhEQJX7DbYaDFtzufMjY3wT03IaniZSO847FNB5z8y3gygc0cqTv4p2UYeia02Y5hzwaNQR1ulclTeqPDiXGxceE5Y7POuHoZUWe8s4c97poucZSv4THcMMrE4eo8epO/vEaWD48TCB5S1yG1qVBOT7M=,iv:b+EmOWw23/XVcVD6i+cExSlQ02BNmdfk23nmOYose9g=,tag:PcZLi48S6UPiON9vrSQDGA==,type:str] + lastmodified: "2024-01-23T20:24:07Z" + mac: ENC[AES256_GCM,data:8Lj/939tJY4vOOuTN6OVN3VqTdKWCYmveibtbYIgdVSm8omNIoEWwZzmfZtKQ+GBIhV9TiI6ZbiBAq+6HaRB1FvnsuPK3o/UCXoOb8s+MKQsKRqHB0gWO75/Zuh3WX2+3SMSe3cq30jMiWj2ChSvqOsimzqdyiM3JJwn5dgZRbo=,iv:T7QJgPcrT80LpvrMllpHgC6/hRxb2h377GTcyjhknbY=,tag:tumGwP/iAvkMnnHc+o5+Pw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/secrets/tailscale/secrets.yaml b/secrets/tailscale/secrets.yaml index 3913dfe..37e2bc4 100644 --- a/secrets/tailscale/secrets.yaml +++ b/secrets/tailscale/secrets.yaml @@ -1,6 +1,7 @@ tsauth-sora: ENC[AES256_GCM,data:GAgCIpYMS5e4t2RW4t6w9jI2mfJQdBq2eRBDAKt6HJ/JaZyv983bx5xojTStqOWYUIKaFZ5IL30=,iv:AQTKdSPr2G9tow/hbgFKSrh/i4D9JaFrc7/JFOvP1Bo=,tag:4ss1dNK0Z//JIWnds/hMKQ==,type:str] tsauth-sakura: ENC[AES256_GCM,data:35SN+Tu9pGXYu/i/VbBFHMwJmAttjLrE5JrcQXUuwqkUbv/jnFuELtwC6jsO9hSllD6vGJJsYoJ3,iv:C3Tl2T6SOrUEdUAFs3Ly8/RPaqj0SKOPwFppeGZf3XI=,tag:o3vtwxMvHUpXpKbXtSqhzQ==,type:str] tsauth-kaze: ENC[AES256_GCM,data:a7kV+lYKjnnHsQipDVnaHtoslvqXpcaawSe0lYXlJiGnTjpXR6SRpq2XgsO6+6g/xi8NZeLUK4U=,iv:yAjGPZrm80u0JpwwWLPLXUxV0uLX1C+t0osUZ/em23o=,tag:7Q6Awv5VKJe9i5uWDeBR7g==,type:str] +tsauth-tsuru: ENC[AES256_GCM,data:xwKUF50aAFzgqgHB0dpnIW0893eBM5izRTbkoinfBYPpM53f5LGyt3nhIkPErVNV2XLg1WcLmxN8,iv:Os1yh1q1/00FLU46jekyvxR0qGdICyqoZKOZMU0hP40=,tag:/kbVkz/Fl0pmTe4Fq8m97w==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +17,8 @@ sops: S2doM1FiZkRFT0dCckx4Tzd1b2pZRHMKEIsD+AjBcHOFSQiXrCuLv+IBcF+4vUYB YeHe81lcjqWO2TEcP1fdBh0JWUtDVXQbZiBDxs5Vlz35x/OnA9fwPQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-05T00:34:38Z" - mac: ENC[AES256_GCM,data:8kxJBDvDVaiB+wTRLXFDNnhzGdWzHS2ntdVxysejN+ghYRqP5qToe6zd9dudOjzOzS15jpLG/MP7Rg5OXRjB656gd+DjkoQzHj5us/EtokOiDW6O8W058nNefQEyrBVtzHBwvphhg8Sh5E7VLWy6QYz3O35//wDXdUH+yX2RYIU=,iv:XQ4WdqdFC0pPR6RG4vOdzBRt8sYoqUJARwHPohLccGE=,tag:cRBJA6S0jJQalOeqzIPo8Q==,type:str] + lastmodified: "2024-01-23T20:10:50Z" + mac: ENC[AES256_GCM,data:adm9m5psXB31LtpT6IENVds0Ydh5BcojSzOWUerxbzmitJbuzwf4pnZBKtCaEOtekFYO4tY0n6X0XHR/bhzFC2Nw4rXDCju07srrImbYwmSq8TL5XzueirzPk5anwvOehs+MuI6Sp9HWgGKv6K+5TuaGZYFLSRXLw9VQb+YmkvU=,iv:KFqbx2jrFQpva5699bHKPcdsbEaZv8PZOPKAR//Iujs=,tag:Q6qmyUm6X56GXDLHnJyD5w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From d1dc3dd74be9a85f36c6653eb6d9983a55247e96 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 15:52:34 -0500 Subject: [PATCH 04/35] ci: test ci --- .woodpecker/deploy.yml | 0 .woodpecker/flake-lock-update.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .woodpecker/deploy.yml delete mode 100644 .woodpecker/flake-lock-update.yml diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml deleted file mode 100644 index e69de29..0000000 diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml deleted file mode 100644 index e69de29..0000000 From 2cb4d45976b43ba1b3325ce5c030fde619cdff4b Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:29:31 -0500 Subject: [PATCH 05/35] ci: test pr ci --- .woodpecker/flake-lock-update.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .woodpecker/flake-lock-update.yml diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml new file mode 100644 index 0000000..b27eac2 --- /dev/null +++ b/.woodpecker/flake-lock-update.yml @@ -0,0 +1,24 @@ +steps: + update: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix flake update + make-pr: + image: johnwalkerx/gitea-pull-request-create-plugin:latest + pull: true + settings: + gitea_address: https://git.flake.sh/ + gitea_token: + from_secret: forgejo_token + owner: ${CI_REPO_OWNER} + repo: ${CI_REPO_NAME} + branch: ${CI_COMMIT_BRANCH} + base_branch: main + pr_title: 'flake.lock: update' + pr_body: PR automatically created by Woodpecker CI + skip_on_missing_branch: true + close_pr_if_empty: true + delete_branch_if_pr_empty: true + merge_when_checks_succeed: false + delete_branch_after_merge: true From b874effa3946ed4152e79ee01fd1385795c5a3f9 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:37:48 -0500 Subject: [PATCH 06/35] nix: allow electron 25 --- modules/nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix.nix b/modules/nix.nix index c21f563..eeeb15a 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -14,6 +14,7 @@ allowUnfree = true; permittedInsecurePackages = [ "electron-24.8.6" + "electron-25.9.0" ]; }; }; From 9bb01593ff3b4e0e431b6c0acbd1f3e8be1514af Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:47:40 -0500 Subject: [PATCH 07/35] ci: fix flake-lock-update --- .woodpecker/flake-lock-update.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index b27eac2..89871fd 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -13,7 +13,7 @@ steps: from_secret: forgejo_token owner: ${CI_REPO_OWNER} repo: ${CI_REPO_NAME} - branch: ${CI_COMMIT_BRANCH} + branch: flake-lock-update base_branch: main pr_title: 'flake.lock: update' pr_body: PR automatically created by Woodpecker CI @@ -22,3 +22,7 @@ steps: delete_branch_if_pr_empty: true merge_when_checks_succeed: false delete_branch_after_merge: true + + when: + event: cron + cron: "flake-lock-update" From 54ada892ad90aa9584caa2df0f8a0647ab406c75 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:50:08 -0500 Subject: [PATCH 08/35] ci: remvoe checks temp --- .woodpecker/checks.yml | 11 ----------- .woodpecker/flake-lock-update.yml | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .woodpecker/checks.yml diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml deleted file mode 100644 index 72f8c83..0000000 --- a/.woodpecker/checks.yml +++ /dev/null @@ -1,11 +0,0 @@ -steps: - check: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix flake check - fmt: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix run nixpkgs#alejandra -- -c . diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 89871fd..1a0cd89 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -15,7 +15,7 @@ steps: repo: ${CI_REPO_NAME} branch: flake-lock-update base_branch: main - pr_title: 'flake.lock: update' + pr_title: "flake.lock: update" pr_body: PR automatically created by Woodpecker CI skip_on_missing_branch: true close_pr_if_empty: true From 3f369c562fecabc14a9ebba6fc6a86bb94413fd6 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:55:48 -0500 Subject: [PATCH 09/35] ci: remove cron for now --- .woodpecker/flake-lock-update.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 1a0cd89..b30dd9c 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -22,7 +22,3 @@ steps: delete_branch_if_pr_empty: true merge_when_checks_succeed: false delete_branch_after_merge: true - - when: - event: cron - cron: "flake-lock-update" From 7ee9c99238f47cea8d23292b6479b163df616b5a Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 16:56:52 -0500 Subject: [PATCH 10/35] ci: dont skip on missing branch --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index b30dd9c..58b2726 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -17,7 +17,7 @@ steps: base_branch: main pr_title: "flake.lock: update" pr_body: PR automatically created by Woodpecker CI - skip_on_missing_branch: true + skip_on_missing_branch: false close_pr_if_empty: true delete_branch_if_pr_empty: true merge_when_checks_succeed: false From 30c11458b1f29855156da2eac0292c1d5aa6db89 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:04:32 -0500 Subject: [PATCH 11/35] ci: readd checks --- .woodpecker/checks.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .woodpecker/checks.yml diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml new file mode 100644 index 0000000..c5dae30 --- /dev/null +++ b/.woodpecker/checks.yml @@ -0,0 +1,15 @@ +steps: + check: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix flake check + fmt: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix run nixpkgs#alejandra -- -c . + when: + - path: + include: ['*.nix'] + exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] From 12fa47b7b45b3503bfb2273edff4a1b86adcdbb3 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:05:09 -0500 Subject: [PATCH 12/35] ci: fix flake checking --- .woodpecker/checks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml index c5dae30..9d53aa2 100644 --- a/.woodpecker/checks.yml +++ b/.woodpecker/checks.yml @@ -4,6 +4,10 @@ steps: commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake check + when: + - path: + include: ['*.nix'] + exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] fmt: image: nixos/nix commands: From fceb21f0aba6efd4d360d0fc46f7ebf41a9268d7 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:19:19 -0500 Subject: [PATCH 13/35] ci: readd crons --- .woodpecker/flake-lock-update.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 58b2726..1e76bc0 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -4,6 +4,9 @@ steps: commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake update + when: + event: cron + cron: "flake-lock-update" make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true @@ -22,3 +25,6 @@ steps: delete_branch_if_pr_empty: true merge_when_checks_succeed: false delete_branch_after_merge: true + when: + event: cron + cron: "flake-lock-update" From 50c4f5c68fb98aa9fbb5c9b1a88e4caae6ed90dc Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:27:57 -0500 Subject: [PATCH 14/35] ci: fmt --- .woodpecker/checks.yml | 12 ++++++------ .woodpecker/flake-lock-update.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml index 9d53aa2..4801ca2 100644 --- a/.woodpecker/checks.yml +++ b/.woodpecker/checks.yml @@ -1,19 +1,19 @@ steps: check: image: nixos/nix + when: + - path: + include: ['*.nix'] + exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake check + fmt: + image: nixos/nix when: - path: include: ['*.nix'] exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] - fmt: - image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix run nixpkgs#alejandra -- -c . - when: - - path: - include: ['*.nix'] - exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 1e76bc0..d69bf3d 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -1,15 +1,18 @@ steps: update: image: nixos/nix + when: + - event: cron + cron: flake-lock-update commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake update - when: - event: cron - cron: "flake-lock-update" make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true + when: + - event: cron + cron: flake-lock-update settings: gitea_address: https://git.flake.sh/ gitea_token: @@ -25,6 +28,3 @@ steps: delete_branch_if_pr_empty: true merge_when_checks_succeed: false delete_branch_after_merge: true - when: - event: cron - cron: "flake-lock-update" From 1034682278155b14eea8a6307fb41bb8d571bf5a Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:42:31 -0500 Subject: [PATCH 15/35] ci: set when globally --- .woodpecker/checks.yml | 12 ++++-------- .woodpecker/flake-lock-update.yml | 11 +++++------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml index 4801ca2..3540e45 100644 --- a/.woodpecker/checks.yml +++ b/.woodpecker/checks.yml @@ -1,19 +1,15 @@ +when: + - path: + include: ['*.nix'] + exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] steps: check: image: nixos/nix - when: - - path: - include: ['*.nix'] - exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake check fmt: image: nixos/nix - when: - - path: - include: ['*.nix'] - exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix run nixpkgs#alejandra -- -c . diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index d69bf3d..b31c404 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -1,18 +1,17 @@ + +when: + - event: cron + cron: flake-lock-update + steps: update: image: nixos/nix - when: - - event: cron - cron: flake-lock-update commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake update make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true - when: - - event: cron - cron: flake-lock-update settings: gitea_address: https://git.flake.sh/ gitea_token: From 60ef82602e3ef7b26f87e690534e22364b0d3c8c Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 17:51:46 -0500 Subject: [PATCH 16/35] ci: update --- .woodpecker/checks.yml | 15 --------------- .woodpecker/flake-lock-update.yml | 6 +++++- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 .woodpecker/checks.yml diff --git a/.woodpecker/checks.yml b/.woodpecker/checks.yml deleted file mode 100644 index 3540e45..0000000 --- a/.woodpecker/checks.yml +++ /dev/null @@ -1,15 +0,0 @@ -when: - - path: - include: ['*.nix'] - exclude: ['*.md', 'docs/**', '.woodpecker/*.yaml', '*.js', '*.lua', '*.scss', '*.nu'] -steps: - check: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix flake check - fmt: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix run nixpkgs#alejandra -- -c . diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index b31c404..5e5fd7a 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -1,4 +1,8 @@ - +clone: + git: + image: woodpeckerci/plugin-git + settings: + branch: flake-lock-update when: - event: cron cron: flake-lock-update From 5175f8275f3335dd1d5b43fea84e2faaf5192c9c Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:01:23 -0500 Subject: [PATCH 17/35] ci: add change pushing --- .woodpecker/flake-lock-update.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 5e5fd7a..fb0442d 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -13,6 +13,16 @@ steps: commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix flake update + push-changes: + image: appleboy/drone-git-push + settings: + branch: flake-lock-update + ssh_key: + from_secret: forgejo_ssh_key + commit: true + commit_message: "flake.lock: update" + author_name: "WoodpeckerCI" + author_email: "woodpecker@flake.sh" make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true @@ -26,7 +36,7 @@ steps: base_branch: main pr_title: "flake.lock: update" pr_body: PR automatically created by Woodpecker CI - skip_on_missing_branch: false + skip_on_missing_branch: true close_pr_if_empty: true delete_branch_if_pr_empty: true merge_when_checks_succeed: false From db9a30785a7069f0571011730b0dfff6003a8a83 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:03:17 -0500 Subject: [PATCH 18/35] ci: try and fix push --- .woodpecker/flake-lock-update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index fb0442d..4f01361 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -16,6 +16,8 @@ steps: push-changes: image: appleboy/drone-git-push settings: + remote: ssh://forgejo@git.flake.sh/notohh/snowflake.git + remote_name: origin branch: flake-lock-update ssh_key: from_secret: forgejo_ssh_key From 3c49477384797bc85434880203739d10e97cd0f9 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:36:37 -0500 Subject: [PATCH 19/35] ci: auth with gh to get circumvent rate limit --- .woodpecker/flake-lock-update.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 4f01361..033f878 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -10,9 +10,11 @@ when: steps: update: image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix flake update + commands: | + echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + echo $GH_PAT >> /etc/nix/nix.conf + nix flake update + secrets: [ gh_pat ] push-changes: image: appleboy/drone-git-push settings: From 8eee3d77d5a4ce8aec1eacfd73ea5131c2b7cfe4 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:40:02 -0500 Subject: [PATCH 20/35] ci: try this --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 033f878..f1eb207 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo $GH_PAT >> /etc/nix/nix.conf + echo 'access-tokens = github.com=$${GH_PAT}' >> /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: From 705f69a6bafb7a9556d800881fad12d9b24e3ec4 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:41:25 -0500 Subject: [PATCH 21/35] ci: try this --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index f1eb207..1d30630 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo 'access-tokens = github.com=$${GH_PAT}' >> /etc/nix/nix.conf + echo 'access-tokens = github.com=$GH_PAT' >> /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: From 0c0c2dc18730f0b5baa90aec844c72fc47a3c2e3 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:49:14 -0500 Subject: [PATCH 22/35] ci: aaaa --- .woodpecker/flake-lock-update.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 1d30630..52b1036 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,8 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo 'access-tokens = github.com=$GH_PAT' >> /etc/nix/nix.conf + echo $GH_PAT >> /etc/nix/nix.conf + cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: From 42fe802b9554bd5c947f2879e3a58c68dbb1d24f Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:50:25 -0500 Subject: [PATCH 23/35] ci: aaabb --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 52b1036..1e39f3a 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo $GH_PAT >> /etc/nix/nix.conf + echo $${GH_PAT} >> /etc/nix/nix.conf cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] From 4dee94cee9204bf7ab181f8d97e19e8a4f4809af Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:51:25 -0500 Subject: [PATCH 24/35] ci: idk anymore --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 1e39f3a..36750c3 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo $${GH_PAT} >> /etc/nix/nix.conf + echo '$${GH_PAT}' >> /etc/nix/nix.conf cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] From bb3cdbc56e43ddaeed0c3b839a2f7c07ac82a0a6 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:54:27 -0500 Subject: [PATCH 25/35] ci: try this --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 36750c3..590fdf4 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo '$${GH_PAT}' >> /etc/nix/nix.conf + echo "echo access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] From 5c609d4c3746f84fa111a21d6839397ebb8dcaf2 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:55:07 -0500 Subject: [PATCH 26/35] ci: fix typo --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 590fdf4..b16ccfb 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo "echo access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf + echo "access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] From 50f75e183be6b05dfcf0d10caf228eea8df1ac2d Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:57:18 -0500 Subject: [PATCH 27/35] ci: remove cat --- .woodpecker/flake-lock-update.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index b16ccfb..e23dc51 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -13,7 +13,6 @@ steps: commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf echo "access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf - cat /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: From 77864e5a7f33d7e67d72437b62dd6f1e87964e70 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 18:59:51 -0500 Subject: [PATCH 28/35] ci: fix push --- .woodpecker/flake-lock-update.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index e23dc51..c01e22b 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,14 +12,13 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo "access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf + echo 'access-tokens = github.com=$${GH_PAT}' >> /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: image: appleboy/drone-git-push settings: remote: ssh://forgejo@git.flake.sh/notohh/snowflake.git - remote_name: origin branch: flake-lock-update ssh_key: from_secret: forgejo_ssh_key From 5a0f36937ef506651d54801619bdfaf482b4cd12 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:00:41 -0500 Subject: [PATCH 29/35] ci: bring back double quotes --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index c01e22b..7e01830 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -12,7 +12,7 @@ steps: image: nixos/nix commands: | echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - echo 'access-tokens = github.com=$${GH_PAT}' >> /etc/nix/nix.conf + echo "access-tokens = github.com=$${GH_PAT}" >> /etc/nix/nix.conf nix flake update secrets: [ gh_pat ] push-changes: From b5e6e6493483d8cf0573048d90d6349281ce623e Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:04:10 -0500 Subject: [PATCH 30/35] ci: fix push --- .woodpecker/flake-lock-update.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 7e01830..4c955c5 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -18,8 +18,9 @@ steps: push-changes: image: appleboy/drone-git-push settings: - remote: ssh://forgejo@git.flake.sh/notohh/snowflake.git + remote_name: origin branch: flake-lock-update + local_ref: flake-lock-update ssh_key: from_secret: forgejo_ssh_key commit: true From a9e2352307969a6710688a673914e58d2d53bd93 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:07:55 -0500 Subject: [PATCH 31/35] ci: update commit author --- .woodpecker/flake-lock-update.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index 4c955c5..a6b9aa3 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -25,8 +25,6 @@ steps: from_secret: forgejo_ssh_key commit: true commit_message: "flake.lock: update" - author_name: "WoodpeckerCI" - author_email: "woodpecker@flake.sh" make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true From 01e47fe28d7e5057d3a087867e0e9b4142326168 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:11:43 -0500 Subject: [PATCH 32/35] ci: fix push --- .woodpecker/flake-lock-update.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index a6b9aa3..fef25ae 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -18,13 +18,15 @@ steps: push-changes: image: appleboy/drone-git-push settings: - remote_name: origin + remote: ssh://forgejo@git.flake.sh:2222/notohh/snowflake.git branch: flake-lock-update local_ref: flake-lock-update ssh_key: from_secret: forgejo_ssh_key commit: true commit_message: "flake.lock: update" + author_name: "WoodpeckerCI" + author_email: "woodpecker@flake.sh" make-pr: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true From 4e149d1658d0307313dc841cd5ddc058f874a515 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:23:41 -0500 Subject: [PATCH 33/35] ci: try this --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index fef25ae..f1cdfbb 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -18,7 +18,7 @@ steps: push-changes: image: appleboy/drone-git-push settings: - remote: ssh://forgejo@git.flake.sh:2222/notohh/snowflake.git + remote: forgejo@git.flake.sh:2222/notohh/snowflake.git branch: flake-lock-update local_ref: flake-lock-update ssh_key: From fe20e2fda5db15433a00cf0bb5e20289a11f7bec Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:28:31 -0500 Subject: [PATCH 34/35] ci: switch back to ssh --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index f1cdfbb..fef25ae 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -18,7 +18,7 @@ steps: push-changes: image: appleboy/drone-git-push settings: - remote: forgejo@git.flake.sh:2222/notohh/snowflake.git + remote: ssh://forgejo@git.flake.sh:2222/notohh/snowflake.git branch: flake-lock-update local_ref: flake-lock-update ssh_key: From b368117a6b53be43bdef6e1f3366ec2d0c89ef86 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 23 Jan 2024 19:36:32 -0500 Subject: [PATCH 35/35] ci: dont skip on missing branch --- .woodpecker/flake-lock-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/flake-lock-update.yml b/.woodpecker/flake-lock-update.yml index fef25ae..fcdc590 100644 --- a/.woodpecker/flake-lock-update.yml +++ b/.woodpecker/flake-lock-update.yml @@ -40,7 +40,7 @@ steps: base_branch: main pr_title: "flake.lock: update" pr_body: PR automatically created by Woodpecker CI - skip_on_missing_branch: true + skip_on_missing_branch: false close_pr_if_empty: true delete_branch_if_pr_empty: true merge_when_checks_succeed: false