merge main

This commit is contained in:
pat-s 2024-04-27 22:58:45 +02:00
parent 75e15442fc
commit 92c648eb84
No known key found for this signature in database
GPG key ID: 3C6318841EF78925

View file

@ -4,12 +4,9 @@ when:
branch: branch:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
- renovate/* - renovate/*
<<<<<<< HEAD:.woodpecker/build.yml
depends_on: depends_on:
- lint - lint
=======
>>>>>>> main:.woodpecker.yml
steps: steps:
# use vendor to cache dependencies # use vendor to cache dependencies