Skip to content

Commit

Permalink
Stop uploading Flutter.framework.zip in iOS engine artifacts
Browse files Browse the repository at this point in the history
Flutter tooling stopped using Flutter.framework in flutter/flutter#71495
g3 stopped using it in cl/347847369

Change-Id: I5a25d4481e28ff736787b5f1ba7de2f81e6ce9c9
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/9560
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Jenn Magder <magder@google.com>
  • Loading branch information
jmagman committed Jan 5, 2021
1 parent 7099219 commit fee629f
Show file tree
Hide file tree
Showing 18 changed files with 114 additions and 1,746 deletions.
132 changes: 8 additions & 124 deletions recipes/engine.expected/mac.json
Expand Up @@ -7540,36 +7540,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS debug Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for debug",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/debug/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/debug/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/debug/Flutter.framework\"}"
"name": "Create iOS debug Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -7664,7 +7635,7 @@
]
},
"name": "Zip ios artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/debug/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_19/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/debug\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/debug/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_19/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/debug\"}"
},
{
"cmd": [
Expand Down Expand Up @@ -7856,36 +7827,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS profile Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for profile",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/profile/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/profile/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/profile/Flutter.framework\"}"
"name": "Create iOS profile Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -7980,7 +7922,7 @@
]
},
"name": "Zip ios-profile artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/profile/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_20/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/profile\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/profile/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_20/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/profile\"}"
},
{
"cmd": [
Expand Down Expand Up @@ -8174,36 +8116,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS release Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for release",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/release/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/release/Flutter.framework\"}"
"name": "Create iOS release Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -8298,7 +8211,7 @@
]
},
"name": "Zip ios-release artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_21/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_21/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
},
{
"cmd": [
Expand Down Expand Up @@ -8397,36 +8310,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS release Flutter.framework (2)"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for release (2)",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/release/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/release/Flutter.framework\"}"
"name": "Create iOS release Flutter.xcframework (2)"
},
{
"cmd": [
Expand Down Expand Up @@ -8521,7 +8405,7 @@
]
},
"name": "Zip ios-release-nobitcode artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_22/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_22/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
},
{
"cmd": [
Expand Down
99 changes: 6 additions & 93 deletions recipes/engine.expected/mac_maven_or_bitcode.json
Expand Up @@ -8246,36 +8246,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS debug Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for debug",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/debug/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/debug/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/debug/Flutter.framework\"}"
"name": "Create iOS debug Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -8370,7 +8341,7 @@
]
},
"name": "Zip ios artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/debug/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_19/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/debug\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/debug/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/debug/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/debug/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_19/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/debug\"}"
},
{
"cmd": [
Expand Down Expand Up @@ -9268,36 +9239,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS profile Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for profile",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/profile/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/profile/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/profile/Flutter.framework\"}"
"name": "Create iOS profile Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -9392,7 +9334,7 @@
]
},
"name": "Zip ios-profile artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/profile/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_20/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/profile\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/profile/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/profile/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/profile/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_20/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/profile\"}"
},
{
"cmd": [
Expand Down Expand Up @@ -10292,36 +10234,7 @@
"RECIPE_REPO[depot_tools]"
]
},
"name": "Create iOS release Flutter.framework"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
"cwd": "[CACHE]/builder",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"GEM_HOME": "[START_DIR]/gems",
"GOMA_DIR": "[CACHE]/goma/client"
},
"env_prefixes": {
"PATH": [
"[START_DIR]/gems/bin",
"[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
]
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
],
"PATH": [
"RECIPE_REPO[depot_tools]"
]
},
"name": "Archive Flutter.framework for release",
"stdin": "{\"entries\": [{\"path\": \"[CACHE]/builder/src/out/release/Flutter.framework\", \"type\": \"dir\"}], \"output\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"root\": \"[CACHE]/builder/src/out/release/Flutter.framework\"}"
"name": "Create iOS release Flutter.xcframework"
},
{
"cmd": [
Expand Down Expand Up @@ -10416,7 +10329,7 @@
]
},
"name": "Zip ios-release artifacts.zip",
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"archive_name\": \"Flutter.framework.zip\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.framework.zip\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_21/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
"stdin": "{\"entries\": [{\"archive_name\": \"Flutter.podspec\", \"path\": \"[CACHE]/builder/src/out/release/Flutter.podspec\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_armv7\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_armv7\", \"type\": \"file\"}, {\"archive_name\": \"gen_snapshot_arm64\", \"path\": \"[CACHE]/builder/src/out/release/gen_snapshot_arm64\", \"type\": \"file\"}, {\"path\": \"[CACHE]/builder/src/out/release/Flutter.xcframework\", \"type\": \"dir\"}], \"output\": \"[CLEANUP]/tmp_tmp_21/artifacts.zip\", \"root\": \"[CACHE]/builder/src/out/release\"}"
},
{
"cmd": [
Expand Down

0 comments on commit fee629f

Please sign in to comment.