From 772129dbeb234eabce3d8603132876a45fb209a4 Mon Sep 17 00:00:00 2001 From: Googol Lee Date: Tue, 19 Nov 2024 19:03:19 +0100 Subject: [PATCH] Remove `continue-on-error: true` because it hides errors. (#1129) * Add test for the workflow. * Remove continue-on-error. * Remove always failing test. * Fix the hidden failure. * Regenerated. --- .github/workflows/tests.yml | 2 -- api/graphql/generated.go | 12 ++++++------ api/graphql/resolvers/album.go | 2 +- api/graphql/resolvers/faces.go | 2 +- api/graphql/resolvers/media.go | 2 +- api/graphql/resolvers/media_geo_json.go | 2 +- api/graphql/resolvers/notification.go | 2 +- api/graphql/resolvers/root.go | 2 +- api/graphql/resolvers/scanner.go | 2 +- api/graphql/resolvers/search.go | 2 +- api/graphql/resolvers/share_token.go | 2 +- api/graphql/resolvers/site_info.go | 2 +- api/graphql/resolvers/thumbnails.go | 2 +- api/graphql/resolvers/timeline.go | 2 +- api/graphql/resolvers/user.go | 2 +- .../executable_worker/magick_cli_test.go | 2 +- 16 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 25958f2a..537805d5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,7 +66,6 @@ jobs: - name: Test id: test - continue-on-error: true run: | docker run --name test --network host \ -v "${{ github.workspace }}:/app" \ @@ -111,7 +110,6 @@ jobs: - name: Test id: test - continue-on-error: true run: | docker run --name test photoview/ui npm run test:ci docker cp test:/app/ui/coverage ./ui/ diff --git a/api/graphql/generated.go b/api/graphql/generated.go index 4dbdbe97..6fd27484 100644 --- a/api/graphql/generated.go +++ b/api/graphql/generated.go @@ -1665,8 +1665,8 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in } func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler { - rc := graphql.GetOperationContext(ctx) - ec := executionContext{rc, e, 0, 0, make(chan graphql.DeferredResult)} + opCtx := graphql.GetOperationContext(ctx) + ec := executionContext{opCtx, e, 0, 0, make(chan graphql.DeferredResult)} inputUnmarshalMap := graphql.BuildUnmarshalerMap( ec.unmarshalInputOrdering, ec.unmarshalInputPagination, @@ -1674,7 +1674,7 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler { ) first := true - switch rc.Operation.Operation { + switch opCtx.Operation.Operation { case ast.Query: return func(ctx context.Context) *graphql.Response { var response graphql.Response @@ -1682,7 +1682,7 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler { if first { first = false ctx = graphql.WithUnmarshalerMap(ctx, inputUnmarshalMap) - data = ec._Query(ctx, rc.Operation.SelectionSet) + data = ec._Query(ctx, opCtx.Operation.SelectionSet) } else { if atomic.LoadInt32(&ec.pendingDeferred) > 0 { result := <-ec.deferredResults @@ -1712,7 +1712,7 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler { } first = false ctx = graphql.WithUnmarshalerMap(ctx, inputUnmarshalMap) - data := ec._Mutation(ctx, rc.Operation.SelectionSet) + data := ec._Mutation(ctx, opCtx.Operation.SelectionSet) var buf bytes.Buffer data.MarshalGQL(&buf) @@ -1721,7 +1721,7 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler { } } case ast.Subscription: - next := ec._Subscription(ctx, rc.Operation.SelectionSet) + next := ec._Subscription(ctx, opCtx.Operation.SelectionSet) var buf bytes.Buffer return func(ctx context.Context) *graphql.Response { diff --git a/api/graphql/resolvers/album.go b/api/graphql/resolvers/album.go index 25a293dd..07bb2add 100644 --- a/api/graphql/resolvers/album.go +++ b/api/graphql/resolvers/album.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/faces.go b/api/graphql/resolvers/faces.go index 238c0979..fe597c2a 100644 --- a/api/graphql/resolvers/faces.go +++ b/api/graphql/resolvers/faces.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/media.go b/api/graphql/resolvers/media.go index 7d88200f..2604be88 100644 --- a/api/graphql/resolvers/media.go +++ b/api/graphql/resolvers/media.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/media_geo_json.go b/api/graphql/resolvers/media_geo_json.go index 8b813a49..3f9f6757 100644 --- a/api/graphql/resolvers/media_geo_json.go +++ b/api/graphql/resolvers/media_geo_json.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/notification.go b/api/graphql/resolvers/notification.go index b3e7eeb5..feb5361f 100644 --- a/api/graphql/resolvers/notification.go +++ b/api/graphql/resolvers/notification.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/root.go b/api/graphql/resolvers/root.go index 158d3d06..cf1f4e05 100644 --- a/api/graphql/resolvers/root.go +++ b/api/graphql/resolvers/root.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( api "github.com/photoview/photoview/api/graphql" diff --git a/api/graphql/resolvers/scanner.go b/api/graphql/resolvers/scanner.go index 6abf5ecf..d21847e8 100644 --- a/api/graphql/resolvers/scanner.go +++ b/api/graphql/resolvers/scanner.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/search.go b/api/graphql/resolvers/search.go index dedf2e13..915ebb5c 100644 --- a/api/graphql/resolvers/search.go +++ b/api/graphql/resolvers/search.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/share_token.go b/api/graphql/resolvers/share_token.go index 790b1b45..f373c72d 100644 --- a/api/graphql/resolvers/share_token.go +++ b/api/graphql/resolvers/share_token.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/site_info.go b/api/graphql/resolvers/site_info.go index 847fc525..fb5bd560 100644 --- a/api/graphql/resolvers/site_info.go +++ b/api/graphql/resolvers/site_info.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/thumbnails.go b/api/graphql/resolvers/thumbnails.go index c449f246..093244da 100644 --- a/api/graphql/resolvers/thumbnails.go +++ b/api/graphql/resolvers/thumbnails.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/timeline.go b/api/graphql/resolvers/timeline.go index 1302e66b..6d05c8a1 100644 --- a/api/graphql/resolvers/timeline.go +++ b/api/graphql/resolvers/timeline.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/graphql/resolvers/user.go b/api/graphql/resolvers/user.go index ab64b2cf..b01d8bd3 100644 --- a/api/graphql/resolvers/user.go +++ b/api/graphql/resolvers/user.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.55 +// Code generated by github.com/99designs/gqlgen version v0.17.56 import ( "context" diff --git a/api/scanner/media_encoding/executable_worker/magick_cli_test.go b/api/scanner/media_encoding/executable_worker/magick_cli_test.go index 8624f029..fe79edfd 100644 --- a/api/scanner/media_encoding/executable_worker/magick_cli_test.go +++ b/api/scanner/media_encoding/executable_worker/magick_cli_test.go @@ -48,7 +48,7 @@ func TestMagickCliFail(t *testing.T) { t.Fatalf(`MagickCli.EncodeJpeg(...) = nil, should be an error.`) } - if got, want := err.Error(), `^encoding image with ".*/testdata/bin/magick \[convert input -quality 70 output\]" error: .*$`; !regexp.MustCompile(want).MatchString(got) { + if got, want := err.Error(), `^encoding image with ".*/testdata/bin/magick \[input -auto-orient -quality 70 output\]" error: .*$`; !regexp.MustCompile(want).MatchString(got) { t.Errorf(`MagickCli.EncodeJpeg(...) = %q, should be matched with reg pattern %q`, got, want) } }