Fix windows log links
Led run: https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/keyonghan_google.com/9cfd27c94b2bbcbe2047eb2c2ae3386b3a0ed6dce5b38352e4d93720baf9f3fd/+/build.proto
Change-Id: Ifc50b8d80f6993f05c1161a9b77d321fd68f79b0
Bug: https://github.com/flutter/flutter/issues/99713
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/31960
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Dan Field <dnfield@google.com>
Commit-Queue: Dan Field <dnfield@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipe_modules/logs_util/api.py b/recipe_modules/logs_util/api.py
index 5d862ac..1df2f4b 100644
--- a/recipe_modules/logs_util/api.py
+++ b/recipe_modules/logs_util/api.py
@@ -67,8 +67,8 @@
)
for log_file in log_files:
base_name = self.m.path.basename(log_file)
- path_plus_base_name = re.sub('^.*flutter_logs_dir/', '', str(log_file))
+
url = pattern_str % (
- 'flutter_logs', invocation_id, task, uuid, path_plus_base_name
+ 'flutter_logs', invocation_id, task, uuid, base_name
)
- presentation.links[path_plus_base_name] = url
+ presentation.links[base_name] = url
diff --git a/recipes/engine/engine.expected/win.json b/recipes/engine/engine.expected/win.json
index ace65fd..a755d97 100644
--- a/recipes/engine/engine.expected/win.json
+++ b/recipes/engine/engine.expected/win.json
@@ -7036,7 +7036,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_font_subset.json b/recipes/engine/engine.expected/win_font_subset.json
index df092ef..172e873 100644
--- a/recipes/engine/engine.expected/win_font_subset.json
+++ b/recipes/engine/engine.expected/win_font_subset.json
@@ -7495,7 +7495,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_no_lto.json b/recipes/engine/engine.expected/win_no_lto.json
index 9f6e8da..2a22159 100644
--- a/recipes/engine/engine.expected/win_no_lto.json
+++ b/recipes/engine/engine.expected/win_no_lto.json
@@ -7042,7 +7042,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset.json b/recipes/engine/engine.expected/win_no_lto_font_subset.json
index ecdf6f3..e170a3c 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset.json
@@ -7501,7 +7501,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_publish_cipd.json b/recipes/engine/engine.expected/win_publish_cipd.json
index ace65fd..a755d97 100644
--- a/recipes/engine/engine.expected/win_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_publish_cipd.json
@@ -7036,7 +7036,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
index df092ef..172e873 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
@@ -7495,7 +7495,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
index 9f6e8da..2a22159 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
@@ -7042,7 +7042,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
index ecdf6f3..e170a3c 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
@@ -7501,7 +7501,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload.json b/recipes/engine/engine.expected/win_upload.json
index 230aa67..ce1e8c8 100644
--- a/recipes/engine/engine.expected/win_upload.json
+++ b/recipes/engine/engine.expected/win_upload.json
@@ -7816,7 +7816,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_font_subset.json b/recipes/engine/engine.expected/win_upload_font_subset.json
index da8d65d..d6f1ea9 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset.json
@@ -8327,7 +8327,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_no_lto.json b/recipes/engine/engine.expected/win_upload_no_lto.json
index 321c17a..f554010 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto.json
@@ -7822,7 +7822,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
index 685bda3..3e0360c 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
@@ -8333,7 +8333,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd.json b/recipes/engine/engine.expected/win_upload_publish_cipd.json
index 230aa67..ce1e8c8 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd.json
@@ -7816,7 +7816,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
index da8d65d..d6f1ea9 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
@@ -8327,7 +8327,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
index 321c17a..f554010 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -7822,7 +7822,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
index 685bda3..3e0360c 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
@@ -8333,7 +8333,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/abcd1234/engine/00000000-0000-0000-0000-000000001340/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine_unopt.expected/win.json b/recipes/engine/engine_unopt.expected/win.json
index d23aa31..f39f46f 100644
--- a/recipes/engine/engine_unopt.expected/win.json
+++ b/recipes/engine/engine_unopt.expected/win.json
@@ -1775,7 +1775,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/engine/00000000-0000-0000-0000-000000001337/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/engine/00000000-0000-0000-0000-000000001337/myfile.txt@@@"
]
},
{
diff --git a/recipes/engine/engine_unopt.expected/win_lto.json b/recipes/engine/engine_unopt.expected/win_lto.json
index af38abf..d1d4e01 100644
--- a/recipes/engine/engine_unopt.expected/win_lto.json
+++ b/recipes/engine/engine_unopt.expected/win_lto.json
@@ -1774,7 +1774,7 @@
"cmd": [],
"name": "log links",
"~followup_annotations": [
- "@@@STEP_LINK@[CLEANUP]\\flutter_logs_dir\\myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/engine/00000000-0000-0000-0000-000000001337/[CLEANUP]\\flutter_logs_dir\\myfile.txt@@@"
+ "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/engine/00000000-0000-0000-0000-000000001337/myfile.txt@@@"
]
},
{
