Compare commits

...

2 commits

Author SHA1 Message Date
f
aedd2467c3 Merge branch 'antifascista' of ssh://nulo.in:420/Sutty/gems into antifascista
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-24 10:58:14 -03:00
f
f580592b7e fix: tell git to merge 2023-04-24 10:53:39 -03:00

View file

@ -10,6 +10,7 @@ pipeline:
- "echo \"[gitea.nulo.in]:420 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgHIbf5/jkeyLMndnWlEO12DPj41YPqkmz+aIreVOsP\" >> ~/.ssh/known_hosts" - "echo \"[gitea.nulo.in]:420 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgHIbf5/jkeyLMndnWlEO12DPj41YPqkmz+aIreVOsP\" >> ~/.ssh/known_hosts"
- "eval $(ssh-agent -s)" - "eval $(ssh-agent -s)"
- "echo \"$${SSH_KEY}\" | base64 -d | ssh-add -" - "echo \"$${SSH_KEY}\" | base64 -d | ssh-add -"
- "git config pull.rebase false"
- "git config user.name Woodpecker" - "git config user.name Woodpecker"
- "git config user.email ci@nulo.in" - "git config user.email ci@nulo.in"
- "git remote add nulo ssh://_gitea@gitea.nulo.in:420/Sutty/gems.git" - "git remote add nulo ssh://_gitea@gitea.nulo.in:420/Sutty/gems.git"