Merge branch 'main' into fix_eol_filtering

canonical · Nov 14, 2024 · 4a4439a · 4a4439a
2 parents d62b609 + e1dbca7
commit 4a4439a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git a/oci/identity-platform-admin-ui/_releases.json b/oci/identity-platform-admin-ui/_releases.json
@@ -1,23 +1,23 @@
 {
     "1.19.0-22.04": {
-        "end-of-life": "2025-03-01T00:00:00Z",
+        "end-of-life": "2024-11-26T00:00:00Z",
         "stable": {
             "target": "1"
         },
         "candidate": {
-            "target": "1"
+            "target": "5"
         },
         "beta": {
             "target": "1.19.0-22.04_candidate"
         },
         "edge": {
-            "target": "1"
+            "target": "5"
         }
     },
     "1-22.04": {
-        "end-of-life": "2025-04-24T00:00:00Z",
+        "end-of-life": "2025-05-12T00:00:00Z",
         "stable": {
-            "target": "2"
+            "target": "4"
         },
         "candidate": {
             "target": "1-22.04_stable"
@@ -30,15 +30,15 @@
         }
     },
     "1.21.0-22.04": {
-        "end-of-life": "2024-11-07T00:00:00Z",
+        "end-of-life": "2024-11-26T00:00:00Z",
         "candidate": {
-            "target": "3"
+            "target": "6"
         },
         "beta": {
             "target": "1.21.0-22.04_candidate"
         },
         "edge": {
-            "target": "3"
+            "target": "6"
         }
     }
 }
diff --git a/oci/identity-platform-login-ui/_releases.json b/oci/identity-platform-login-ui/_releases.json
@@ -0,0 +1,17 @@
+{
+    "0-22.04": {
+        "end-of-life": "2025-05-14T00:00:00Z",
+        "stable": {
+            "target": "4"
+        },
+        "candidate": {
+            "target": "0-22.04_stable"
+        },
+        "beta": {
+            "target": "0-22.04_candidate"
+        },
+        "edge": {
+            "target": "0-22.04_beta"
+        }
+    }
+}
diff --git a/oci/kratos/_releases.json b/oci/kratos/_releases.json
@@ -15,9 +15,9 @@
         }
     },
     "1-22.04": {
-        "end-of-life": "2025-02-07T00:00:00Z",
+        "end-of-life": "2025-02-13T00:00:00Z",
         "stable": {
-            "target": "2"
+            "target": "3"
         },
         "candidate": {
             "target": "1-22.04_stable"

diff --git a/tools/cli-client/go.mod b/tools/cli-client/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/briandowns/spinner v1.23.0
 	github.com/canonical/go-flags v0.0.0-20230403090104-105d09a091b8
 	github.com/go-git/go-git/v5 v5.12.0
-	golang.org/x/term v0.25.0
+	golang.org/x/term v0.26.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -37,7 +37,7 @@ require (
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
diff --git a/tools/cli-client/go.sum b/tools/cli-client/go.sum
@@ -128,6 +128,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
 golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -137,6 +139,8 @@ golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
 golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
 golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
+golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

diff --git a/tools/workflow-engine/charms/temporal-worker/pyproject.toml b/tools/workflow-engine/charms/temporal-worker/pyproject.toml
@@ -28,7 +28,7 @@ importlib-resources = "^6.0.1"
 pytest = "^7.1.3"
 black = "^22.8.0"
 isort = "^5.10.1"
-poethepoet = "^0.29.0"
+poethepoet = "^0.30.0"
 pytest-asyncio = "^0.19.0"
 mypy = "^0.971"