Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(mergify): upgrade configuration to current format #795

Merged
merged 1 commit into from
Nov 25, 2024
+18 −23
Merged

ci(mergify): upgrade configuration to current format #795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 18 additions & 23 deletions .github/mergify.yml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,28 @@

pull_request_rules:
# rebase+merge strategy
- actions:
- name: Put pull requests in the rebase+merge queue + Put pull requests in the squash+merge
queue
conditions: []
actions:
queue:
name: default
# Merge into master with a merge commit
method: merge
# Update the pr branch with rebase, so the history is clean
update_method: rebase
name: Put pull requests in the rebase+merge queue
conditions:
queue_rules:
- name: duplicated default from Put pull requests in the squash+merge queue
queue_conditions:
- label=merge me
- 'check-success=Frontend_tests'
- 'check-success~=.*Backend_tests.*'
# - '#approved-reviews-by>=1'
# merge+squash strategy
- actions:
queue:
name: default
method: squash
# both update methods get absorbed by the squash, so we use the most
# reliable
update_method: merge
name: Put pull requests in the squash+merge queue
conditions:
- label=squash+merge me
- 'check-success=Frontend_tests'
- 'check-success=Backend_tests'
# - '#approved-reviews-by>=1'

queue_rules:
merge_conditions: []
update_method: merge
merge_method: squash
- name: default
conditions: []
queue_conditions:
- label=merge me
- 'check-success=Frontend_tests'
- 'check-success~=.*Backend_tests.*'
merge_conditions: []
update_method: rebase
merge_method: merge

Unchanged files with check annotations Beta

View file
src/core/Flora/Model/Job.hs
$(deriveJSON defaultOptions{fieldLabelModifier = camelTo2 '_'} ''Job)
instance ToJSON LogEvent where
toJSON = \case

Check warning on line 99 in src/core/Flora/Model/Job.hs

GitHub Actions / Backend_tests (9.6.6, ubuntu-latest) 

Pattern match(es) are non-exhaustive
LogJobStart job -> toJSON ("start" :: Text, job)
LogJobSuccess job time -> toJSON ("success" :: Text, job, time)
LogJobFailed job exception failuremode finishTime ->
View file
src/core/Flora/Import/Package/Bulk.hs
-> Eff es ()
importFromIndex user repositoryName index = do
entries <- Tar.read . GZip.decompress <$> liftIO (BL.readFile index)
let Right repositoryPackages = buildPackageListFromArchive entries

Check warning on line 96 in src/core/Flora/Import/Package/Bulk.hs

GitHub Actions / Backend_tests (9.6.6, ubuntu-latest) 

Pattern match(es) are non-exhaustive
Log.logInfo "packages" $
object
[ "repository" .= repositoryName
View file
src/web/FloraWeb/API/Routes/Packages/Types.hs
components = fmap display releaseComponents
in PackageDTO{..}
$(deriveJSON defaultOptions{fieldLabelModifier = camelTo2 '_'} ''PackageDTO)

Check warning on line 73 in src/web/FloraWeb/API/Routes/Packages/Types.hs

GitHub Actions / Backend_tests (9.6.6, ubuntu-latest) 

The record update defaultOptions
instance KnownNat i => ToSchema (PackageDTO i) where
declareNamedSchema proxy =
View file
src/web/FloraWeb/Components/PaginationNav.hs
}
mkURL :: SearchAction -> Positive Word -> Text
mkURL ListAllPackages pageNumber =

Check warning on line 45 in src/web/FloraWeb/Components/PaginationNav.hs

GitHub Actions / Backend_tests (9.6.6, ubuntu-latest) 

Pattern match(es) are non-exhaustive
"/" <> toUrlPiece (Links.packageIndexLink pageNumber)
mkURL (ListAllPackagesInNamespace namespace) pageNumber =
Links.namespacePage namespace pageNumber