From 681f16be93ebbea69a67cfadd2d94af89fa2233d Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 14 Jul 2023 11:15:59 +0000 Subject: [PATCH 01/11] chore(health): adjust health evalutation --- messages/uniworx/categories/health/de-de-formal.msg | 2 +- messages/uniworx/categories/health/en-eu.msg | 2 +- src/Application.hs | 6 +++--- src/Jobs.hs | 2 +- src/Model/Types/Health.hs | 13 +++++++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/messages/uniworx/categories/health/de-de-formal.msg b/messages/uniworx/categories/health/de-de-formal.msg index 75aa473dd..2c8355493 100644 --- a/messages/uniworx/categories/health/de-de-formal.msg +++ b/messages/uniworx/categories/health/de-de-formal.msg @@ -9,7 +9,7 @@ HealthCheckLDAPAdmins: Anteil der Administrator:innen mit LDAP Authentifizierung HealthCheckSMTPConnect: SMTP-Server kann erreicht werden HealthCheckWidgetMemcached: Memcached-Server liefert Widgets korrekt aus HealthCheckActiveJobExecutors: Anteil der job-workers, die neue Befehle annehmen -HealthCheckDoesFlush: Zustandsprüfung läuft durch +HealthCheckDoesFlush: Abgearbeitete Jobs werden aufgeräumt InstanceIdentification: Instanz-Identifikation InstanceId: Instanz-Nummer ClusterId: Cluster-Nummer \ No newline at end of file diff --git a/messages/uniworx/categories/health/en-eu.msg b/messages/uniworx/categories/health/en-eu.msg index 948a7c4cc..4e24bd8bb 100644 --- a/messages/uniworx/categories/health/en-eu.msg +++ b/messages/uniworx/categories/health/en-eu.msg @@ -9,7 +9,7 @@ HealthCheckLDAPAdmins: Proportion of administrators with LDAP authentication tha HealthCheckSMTPConnect: SMTP server is reachable HealthCheckWidgetMemcached: Memcached server is serving widgets correctly HealthCheckActiveJobExecutors: Proportion of job workers accepting new jobs -HealthCheckDoesFlush: Health reports flushes +HealthCheckDoesFlush: Executed jobs are removed InstanceIdentification: Instance identification InstanceId: Instance id ClusterId: Cluster id diff --git a/src/Application.hs b/src/Application.hs index 6592a8342..90d344bfd 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -550,8 +550,8 @@ warpSettings foundation = defaultSettings & Set.filter (is _Just . (foundation ^. _appHealthCheckInterval)) atomically $ do results <- readTVar $ foundation ^. _appHealthReport - guard $ activeChecks == Set.map (classifyHealthReport . snd) results - guard . (== Min HealthSuccess) $ foldMap (Min . healthReportStatus . snd) results + guard $ activeChecks `Set.isSubsetOf` Set.map (classifyHealthReport . snd) results + guard . (/= Min HealthFailure) $ foldMap (Min . healthReportStatus . snd) results notifyReady | otherwise -> notifyReady @@ -679,7 +679,7 @@ appMain = runResourceT $ do interval <- mInterval let lastSuccess = maybeMonoid mResults & Set.filter (\(_, rep) -> classifyHealthReport rep == hc) - & Set.filter (\(_, rep) -> healthReportStatus rep >= HealthSuccess) + & Set.filter (\(_, rep) -> healthReportStatus rep > HealthFailure) & Set.mapMonotonic (view _1) & Set.lookupMax diff --git a/src/Jobs.hs b/src/Jobs.hs index c658668dc..0d5993ce7 100644 --- a/src/Jobs.hs +++ b/src/Jobs.hs @@ -593,7 +593,7 @@ handleJobs' wNum = C.mapM_ $ \jctl -> hoist delimitInternalState . withJobWorker newReport@(healthReportStatus -> newStatus) <- lift $ generateHealthReport kind $logInfoS logIdent [st|#{tshow kind}: #{toPathPiece newStatus}|] - unless (newStatus == HealthSuccess) $ do + unless (newStatus > HealthFailure) $ do $logErrorS logIdent [st|#{tshow kind}: #{tshow newReport}|] liftIO $ do diff --git a/src/Model/Types/Health.hs b/src/Model/Types/Health.hs index 36f4be750..64ad49b3a 100644 --- a/src/Model/Types/Health.hs +++ b/src/Model/Types/Health.hs @@ -67,10 +67,10 @@ classifyHealthReport :: HealthReport -> HealthCheck classifyHealthReport HealthMatchingClusterConfig{} = HealthCheckMatchingClusterConfig classifyHealthReport HealthLDAPAdmins{} = HealthCheckLDAPAdmins classifyHealthReport HealthHTTPReachable{} = HealthCheckHTTPReachable -classifyHealthReport HealthSMTPConnect{} = HealthCheckSMTPConnect -classifyHealthReport HealthWidgetMemcached{} = HealthCheckWidgetMemcached -classifyHealthReport HealthActiveJobExecutors{} = HealthCheckActiveJobExecutors -classifyHealthReport HealthDoesFlush{} = HealthCheckDoesFlush +classifyHealthReport HealthSMTPConnect{} = HealthCheckSMTPConnect +classifyHealthReport HealthWidgetMemcached{} = HealthCheckWidgetMemcached -- kein Neustart notwendig +classifyHealthReport HealthActiveJobExecutors{} = HealthCheckActiveJobExecutors +classifyHealthReport HealthDoesFlush{} = HealthCheckDoesFlush -- evtl. kein Neustart notwendig -- | `HealthReport` classified (`classifyHealthReport`) by badness -- @@ -111,7 +111,8 @@ healthReportStatus = \case HealthActiveJobExecutors Nothing -> HealthInactive HealthActiveJobExecutors (Just prop ) | prop > 0 -> HealthSuccess - HealthDoesFlush mProp - | maybe True (>= 2) mProp -> HealthFailure -- Looks buggy to me? + HealthDoesFlush Nothing -> HealthInactive + HealthDoesFlush (Just prop ) + | prop >= 2 -> HealthFailure | otherwise -> HealthSuccess _other -> HealthFailure From 2fc7ac610bd386b1e23dc2ee1ff590fa28812331 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 14 Jul 2023 12:32:26 +0000 Subject: [PATCH 02/11] chore(job): add more columns to queued job view --- .../utils/table_column/de-de-formal.msg | 3 +++ messages/uniworx/utils/table_column/en-eu.msg | 5 ++++- src/Handler/Admin/Crontab.hs | 18 ++++++++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/messages/uniworx/utils/table_column/de-de-formal.msg b/messages/uniworx/utils/table_column/de-de-formal.msg index e95b4757e..5b03468c8 100644 --- a/messages/uniworx/utils/table_column/de-de-formal.msg +++ b/messages/uniworx/utils/table_column/de-de-formal.msg @@ -81,3 +81,6 @@ TableSupervisor: Ansprechpartner TableCreationTime: Erstellungszeit TableJob !ident-ok: Job TableJobContent !ident-ok: Parameter +TableJobLockTime: Bearbeitung seit +TableJobLockInstance: Bearbeiter +TableJobCreationInstance: Ersteller \ No newline at end of file diff --git a/messages/uniworx/utils/table_column/en-eu.msg b/messages/uniworx/utils/table_column/en-eu.msg index 682c66966..e27dfebdf 100644 --- a/messages/uniworx/utils/table_column/en-eu.msg +++ b/messages/uniworx/utils/table_column/en-eu.msg @@ -80,4 +80,7 @@ TableCompanyNos: Company numbers TableSupervisor: Supervisor TableCreationTime: Creation TableJob !ident-ok: Job -TableJobContent !ident-ok: Parameters \ No newline at end of file +TableJobContent !ident-ok: Parameters +TableJobLockTime: Lock time +TableJobLockInstance: Worker +TableJobCreationInstance: Creator \ No newline at end of file diff --git a/src/Handler/Admin/Crontab.hs b/src/Handler/Admin/Crontab.hs index 18b14fbe6..f309ab73f 100644 --- a/src/Handler/Admin/Crontab.hs +++ b/src/Handler/Admin/Crontab.hs @@ -121,14 +121,20 @@ postAdminJobsR = do dbtRowKey = (E.^. QueuedJobId) dbtProj = dbtProjId dbtColonnade = dbColonnade $ mconcat -- remove call to dbColonnade if table actions are added - [ sortable (Just "job") (i18nCell MsgTableJob) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe textCell $ getJobName queuedJobContent - , sortable (Just "creation-time") (i18nCell MsgTableCreationTime) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> dateTimeCell queuedJobCreationTime - , sortable (Just "content") (i18nCell MsgTableJobContent) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cell [whamlet|#{doEnc queuedJobContent}|] & addCellClass ("json"::Text) + [ sortable (Just "job") (i18nCell MsgTableJob) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe textCell $ getJobName queuedJobContent + , sortable (Just "creation-time") (i18nCell MsgTableCreationTime) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> dateTimeCell queuedJobCreationTime + , sortable (Just "content") (i18nCell MsgTableJobContent) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cell [whamlet|#{doEnc queuedJobContent}|] & addCellClass ("json"::Text) + , sortable (Just "lock-time") (i18nCell MsgTableJobLockTime) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe dateTimeCell queuedJobLockTime + , sortable (Just "lock-instance") (i18nCell MsgTableJobLockInstance) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe (stringCell . show) queuedJobLockInstance + , sortable (Just "creation-instance") (i18nCell MsgTableJobCreationInstance) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> stringCell $ show queuedJobCreationInstance ] dbtSorting = Map.fromList - [ ("creation-time", SortColumnNullsInv (E.^. QueuedJobCreationTime)) - , ("job" , SortColumn (\v -> v E.^. QueuedJobContent E.->>. "job")) - , ("content" , SortColumn (E.^. QueuedJobContent)) + [ ("creation-time" , SortColumnNullsInv (E.^. QueuedJobCreationTime)) + , ("job" , SortColumn (\v -> v E.^. QueuedJobContent E.->>. "job")) + , ("content" , SortColumn (E.^. QueuedJobContent)) + , ("lock-time" , SortColumnNullsInv (E.^. QueuedJobLockTime)) + , ("lock-instance" , SortColumn (E.^. QueuedJobLockInstance)) + , ("creation-instance", SortColumn (E.^. QueuedJobCreationInstance)) ] dbtFilter = Map.fromList [ From 5b9a5545457dbe506d20f7362fb6e0d6bae4f7f4 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 14 Jul 2023 15:48:18 +0000 Subject: [PATCH 03/11] fix(job): fix #95 by implementing queued job deletion for admins --- .../utils/table_column/de-de-formal.msg | 4 +- messages/uniworx/utils/table_column/en-eu.msg | 4 +- src/Handler/Admin/Crontab.hs | 61 +++++++++++++++++-- src/Handler/LMS.hs | 1 - 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/messages/uniworx/utils/table_column/de-de-formal.msg b/messages/uniworx/utils/table_column/de-de-formal.msg index 5b03468c8..16d43de61 100644 --- a/messages/uniworx/utils/table_column/de-de-formal.msg +++ b/messages/uniworx/utils/table_column/de-de-formal.msg @@ -83,4 +83,6 @@ TableJob !ident-ok: Job TableJobContent !ident-ok: Parameter TableJobLockTime: Bearbeitung seit TableJobLockInstance: Bearbeiter -TableJobCreationInstance: Ersteller \ No newline at end of file +TableJobCreationInstance: Ersteller +ActJobDelete: Job entfernen +TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} Jobs entfernt \ No newline at end of file diff --git a/messages/uniworx/utils/table_column/en-eu.msg b/messages/uniworx/utils/table_column/en-eu.msg index e27dfebdf..17fbfe79a 100644 --- a/messages/uniworx/utils/table_column/en-eu.msg +++ b/messages/uniworx/utils/table_column/en-eu.msg @@ -83,4 +83,6 @@ TableJob !ident-ok: Job TableJobContent !ident-ok: Parameters TableJobLockTime: Lock time TableJobLockInstance: Worker -TableJobCreationInstance: Creator \ No newline at end of file +TableJobCreationInstance: Creator +ActJobDelete: Delete job +TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} queued jobs deleted \ No newline at end of file diff --git a/src/Handler/Admin/Crontab.hs b/src/Handler/Admin/Crontab.hs index f309ab73f..42844d91d 100644 --- a/src/Handler/Admin/Crontab.hs +++ b/src/Handler/Admin/Crontab.hs @@ -23,12 +23,14 @@ import qualified Data.Aeson.Encode.Pretty as Pretty import qualified Data.Text as Text import qualified Data.Text.Lazy.Builder as Text.Builder +import qualified Data.Set as Set import qualified Data.Map as Map import qualified Data.HashSet as HashSet import qualified Data.HashMap.Strict as HashMap import qualified Data.UUID as UUID +import Database.Persist.Sql (deleteWhereCount) import qualified Database.Esqueleto.Legacy as E import qualified Database.Esqueleto.Utils as E -- import Database.Esqueleto.Utils.TH @@ -108,6 +110,19 @@ getAdminCrontabR = do } +data JobTableAction = ActJobDelete + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + +instance Universe JobTableAction +instance Finite JobTableAction +nullaryPathPiece ''JobTableAction $ camelToPathPiece' 1 +embedRenderMessage ''UniWorX ''JobTableAction id + +-- Not yet needed, since there is no additional data for now (also, postprocess did not type somehow) +-- data JobTableActionData = ActJobDeleteData +-- deriving (Eq, Ord, Read, Show, Generic) + + getAdminJobsR, postAdminJobsR :: Handler Html getAdminJobsR = postAdminJobsR postAdminJobsR = do @@ -117,11 +132,15 @@ postAdminJobsR = do resultJob :: Lens' (DBRow (Entity QueuedJob)) (Entity QueuedJob) resultJob = _dbrOutput + dbtIdent :: Text + dbtIdent = "queued-jobs" + dbtSQLQuery = return dbtRowKey = (E.^. QueuedJobId) dbtProj = dbtProjId - dbtColonnade = dbColonnade $ mconcat -- remove call to dbColonnade if table actions are added - [ sortable (Just "job") (i18nCell MsgTableJob) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe textCell $ getJobName queuedJobContent + dbtColonnade = mconcat + [ dbSelect (applying _2) id (return . view (resultJob . _entityKey)) + , sortable (Just "job") (i18nCell MsgTableJob) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe textCell $ getJobName queuedJobContent , sortable (Just "creation-time") (i18nCell MsgTableCreationTime) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> dateTimeCell queuedJobCreationTime , sortable (Just "content") (i18nCell MsgTableJobContent) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cell [whamlet|#{doEnc queuedJobContent}|] & addCellClass ("json"::Text) , sortable (Just "lock-time") (i18nCell MsgTableJobLockTime) $ \(view $ resultJob . _entityVal -> QueuedJob{..}) -> cellMaybe dateTimeCell queuedJobLockTime @@ -145,15 +164,45 @@ postAdminJobsR = do prismAForm (singletonFilter "job" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableJob) ] dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout } - dbtParams = def - dbtIdent :: Text - dbtIdent = "queued-jobs" + acts :: Map JobTableAction (AForm Handler JobTableAction) + acts = Map.singleton ActJobDelete $ pure ActJobDelete + dbtParams = DBParamsForm + { dbParamsFormAdditional = + renderAForm FormStandard + $ (, mempty) . First . Just + <$> multiActionA acts (fslI MsgTableAction) Nothing + , dbParamsFormMethod = POST + , dbParamsFormAction = Nothing -- Just $ SomeRoute currentRoute + , dbParamsFormAttrs = [] + , dbParamsFormSubmit = FormSubmit + , dbParamsFormEvaluate = liftHandler . runFormPost + , dbParamsFormResult = id + , dbParamsFormIdent = def + } dbtCsvEncode = noCsvEncode dbtCsvDecode = Nothing dbtExtraReps = [] + -- jobsDBTableValidator :: PSValidator (MForm Handler) (FormResult (First JobTableAction, DBFormResult QueuedJobId Bool (DBRow (Entity QueuedJob)))) jobsDBTableValidator = def & defaultSorting [SortDescBy "creation-time"] - ((), jobsTable) <- runDB $ dbTable jobsDBTableValidator jobsDBTable + -- postprocess :: FormResult (First JobTableAction, DBFormResult QueuedJobId Bool (DBRow (Entity QueuedJob))) + -- -> FormResult (JobTableAction, Set QueuedJobId) + postprocess inp = do + (First (Just act), jobMap) <- inp + let jobSet = Map.keysSet . Map.filter id $ getDBFormResult (const False) jobMap + return (act, jobSet) + (jobActRes, jobsTable) <- runDB (over _1 postprocess <$> dbTable jobsDBTableValidator jobsDBTable) + + formResult jobActRes $ \case + (ActJobDelete, jobIds) -> do + let jobReq = length jobIds + rmvd <- fromIntegral <$> runDB (deleteWhereCount + [ QueuedJobLockTime ==. Nothing + , QueuedJobLockInstance ==. Nothing + , QueuedJobId <-. Set.toList jobIds + ]) + addMessageI (bool Success Warning $ rmvd < jobReq) (MsgTableJobActDeleteFeedback rmvd jobReq) + reloadKeepGetParams AdminJobsR siteLayoutMsg MsgMenuAdminJobs $ do setTitleI MsgMenuAdminJobs diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index 34d20300e..2c886be11 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -326,7 +326,6 @@ instance Finite LmsTableAction nullaryPathPiece ''LmsTableAction $ camelToPathPiece' 2 embedRenderMessage ''UniWorX ''LmsTableAction id --- Not yet needed, since there is no additional data for now: data LmsTableActionData = LmsActNotifyData | LmsActRenewNotifyData | LmsActRenewPinData -- no longer used From 9b77bfcdc0e685625126ce09d20481599b7d5af5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 14 Jul 2023 19:35:01 +0000 Subject: [PATCH 04/11] chore(release): 27.4.14 --- CHANGELOG.md | 8 ++++++++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5eebd6c..6c994dfbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-14) + + +### Bug Fixes + +* **avs:** eliminate call to undefined in Esqueleto.Internals ([240c6f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/240c6f81f81d1872317da01411fa67ec97e3b16d)) +* **job:** fix [#95](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/95) by implementing queued job deletion for admins ([5b9a554](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5b9a5545457dbe506d20f7362fb6e0d6bae4f7f4)) + ## [27.4.13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.12...v27.4.13) (2023-07-12) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index fe44f31d2..82f0bdba7 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.13" + "version": "27.4.14" } diff --git a/nix/docker/version.json b/nix/docker/version.json index fe44f31d2..82f0bdba7 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.13" + "version": "27.4.14" } diff --git a/package-lock.json b/package-lock.json index 1573d51d9..e9fdffe9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.13", + "version": "27.4.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9905d5fcd..9f2805cf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.13", + "version": "27.4.14", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 4ce8a77e3..cfe01b928 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.13 +version: 27.4.14 dependencies: - base - yesod From eb6d868a11f7bc7d159ad02c27768e752c4da8b9 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 17 Jul 2023 11:16:17 +0000 Subject: [PATCH 05/11] bumb version --- src/Handler/Admin/Crontab.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Handler/Admin/Crontab.hs b/src/Handler/Admin/Crontab.hs index 42844d91d..5cb000074 100644 --- a/src/Handler/Admin/Crontab.hs +++ b/src/Handler/Admin/Crontab.hs @@ -204,6 +204,7 @@ postAdminJobsR = do addMessageI (bool Success Warning $ rmvd < jobReq) (MsgTableJobActDeleteFeedback rmvd jobReq) reloadKeepGetParams AdminJobsR + siteLayoutMsg MsgMenuAdminJobs $ do setTitleI MsgMenuAdminJobs [whamlet| From 747bd50cfb6f3dafe804cf87629ddbb38ad799c9 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 17 Jul 2023 13:45:16 +0000 Subject: [PATCH 06/11] chore(release): 27.4.15 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c994dfbb..b05f42a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.15) (2023-07-17) + ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-14) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 82f0bdba7..702413be4 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.14" + "version": "27.4.15" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 82f0bdba7..702413be4 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.14" + "version": "27.4.15" } diff --git a/package-lock.json b/package-lock.json index e9fdffe9a..31c0f358e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9f2805cf4..634888c56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index cfe01b928..fa0e1fa2c 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.14 +version: 27.4.15 dependencies: - base - yesod From 82db2e5bd48c8cb19d8d16d518d62c1c6dfaa8fb Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 17 Jul 2023 13:47:02 +0000 Subject: [PATCH 07/11] chore(release): 27.4.16 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b05f42a1e..e3aa60e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.16) (2023-07-17) + ## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.15) (2023-07-17) ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-14) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 702413be4..2916072c2 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.15" + "version": "27.4.16" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 702413be4..2916072c2 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.15" + "version": "27.4.16" } diff --git a/package-lock.json b/package-lock.json index 31c0f358e..a2e75586b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 634888c56..41bd3bad5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index fa0e1fa2c..3ff2e97f1 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.15 +version: 27.4.16 dependencies: - base - yesod From 9818cc6186b07e5d03f655a57a7241db533866fc Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 17 Jul 2023 13:47:53 +0000 Subject: [PATCH 08/11] chore(release): 27.4.17 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3aa60e30..a568b7dfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.17](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.17) (2023-07-17) + ## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.16) (2023-07-17) ## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.15) (2023-07-17) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 2916072c2..2c857ea0a 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.16" + "version": "27.4.17" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 2916072c2..2c857ea0a 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.16" + "version": "27.4.17" } diff --git a/package-lock.json b/package-lock.json index a2e75586b..70d7a6681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.16", + "version": "27.4.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 41bd3bad5..560cbd37b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.16", + "version": "27.4.17", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 3ff2e97f1..32c5abf02 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.16 +version: 27.4.17 dependencies: - base - yesod From b57297ce1b9d2181806a069f02155985af31e8de Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 17 Jul 2023 13:48:56 +0000 Subject: [PATCH 09/11] chore(release): 27.4.15 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c994dfbb..b05f42a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.15) (2023-07-17) + ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-14) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 82f0bdba7..702413be4 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.14" + "version": "27.4.15" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 82f0bdba7..702413be4 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.14" + "version": "27.4.15" } diff --git a/package-lock.json b/package-lock.json index e9fdffe9a..31c0f358e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9f2805cf4..634888c56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index cfe01b928..fa0e1fa2c 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.14 +version: 27.4.15 dependencies: - base - yesod From 9651104d0fbfd51ee006edd3b7094f91d9f10c3b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 17 Jul 2023 13:51:12 +0000 Subject: [PATCH 10/11] chore(release): 27.4.16 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b05f42a1e..e3aa60e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.16) (2023-07-17) + ## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.15) (2023-07-17) ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-14) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 702413be4..2916072c2 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.15" + "version": "27.4.16" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 702413be4..2916072c2 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.15" + "version": "27.4.16" } diff --git a/package-lock.json b/package-lock.json index 31c0f358e..a2e75586b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 634888c56..41bd3bad5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index fa0e1fa2c..3ff2e97f1 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.15 +version: 27.4.16 dependencies: - base - yesod From a825cc814e1eb684c0c33fda373a2f4f7ff44135 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 17 Jul 2023 13:52:21 +0000 Subject: [PATCH 11/11] chore(release): 27.4.18 --- CHANGELOG.md | 2 ++ nix/docker/demo-version.json | 2 +- nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a568b7dfe..d1129dc3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.18](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.18) (2023-07-17) + ## [27.4.17](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.17) (2023-07-17) ## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.14...v27.4.16) (2023-07-17) diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json index 2c857ea0a..3a246763d 100644 --- a/nix/docker/demo-version.json +++ b/nix/docker/demo-version.json @@ -1,3 +1,3 @@ { - "version": "27.4.17" + "version": "27.4.18" } diff --git a/nix/docker/version.json b/nix/docker/version.json index 2c857ea0a..3a246763d 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.17" + "version": "27.4.18" } diff --git a/package-lock.json b/package-lock.json index 70d7a6681..53d8cf06a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.17", + "version": "27.4.18", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 560cbd37b..3a6f218ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.17", + "version": "27.4.18", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 32c5abf02..eab21aa3e 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.17 +version: 27.4.18 dependencies: - base - yesod