From 0b9414369e7f7dcd5d96fb3646f5a08501c95de6 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 26 Apr 2022 12:14:52 -0400 Subject: [PATCH 01/12] iOS: Change release artifacts to use xcframeworks Fixes #2215 & #2216 Signed-off-by: JP Simard --- .github/workflows/release.yml | 65 +++++++---------------------- BUILD | 6 +++ EnvoyMobile.podspec | 7 ++-- docs/root/intro/version_history.rst | 16 +++++++ library/swift/BUILD | 28 +++++++++++++ library/swift/resources/BUILD | 6 +++ library/swift/resources/Info.plist | 16 +++++++ 7 files changed, 91 insertions(+), 53 deletions(-) create mode 100644 library/swift/resources/BUILD create mode 100644 library/swift/resources/Info.plist diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59a6ceaeb3..79ccd7db79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,8 +100,8 @@ jobs: dist/envoy-pom.xml.asc \ dist/envoy-javadoc.jar.asc - ios_release_artifacts_framework: - name: ios_release_artifacts_framework + ios_release_artifacts: + name: ios_release_artifacts runs-on: macos-12 timeout-minutes: 120 steps: @@ -110,79 +110,46 @@ jobs: submodules: true - name: 'Install dependencies' run: ./ci/mac_ci_setup.sh - - name: 'Build Envoy.framework distributable' + - name: 'Build Envoy.xcframework' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | ./bazelw build \ --config=release-ios \ - --ios_multi_cpus=i386,x86_64,armv7,arm64 \ --config=remote-ci-macos \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ - //:ios_dist + //:ios_xcframework - name: 'Create temporary directory for artifact to produce properly named zip' - run: mkdir -p dist/ios_artifact/Envoy.framework - - name: 'Move artifact to directory for zipping' - run: mv dist/Envoy.framework/* dist/ios_artifact/Envoy.framework + run: mkdir ios_framework + - name: 'Unzip framework to archive directory' + run: unzip bazel-bin/library/swift/Envoy.xcframework.zip -d ios_framework + - name: 'Copy LICENSE to archive directory' + run: cp LICENSE ios_framework + - name: 'Zip archive directory' + run: zip -r ios_framework.zip ios_framework - uses: actions/upload-artifact@v2 with: - name: envoy_ios_framework - path: dist/ios_artifact - - ios_release_artifacts_cocoapods: - name: ios_release_artifacts_cocoapods - runs-on: macos-12 - timeout-minutes: 45 - needs: [ios_release_artifacts_framework] - steps: - - uses: actions/checkout@v1 - with: - submodules: true - - name: 'Install dependencies' - run: ./ci/mac_ci_setup.sh - - uses: actions/download-artifact@v3 - with: - name: envoy_ios_framework - path: dist/envoy_ios_cocoapods - - name: 'Copy license for CocoaPods' - run: cp LICENSE dist/envoy_ios_cocoapods - - name: 'Create empty Swift sources directory' - run: mkdir -p dist/envoy_ios_cocoapods/Envoy.framework/Swift - - name: 'Create empty Swift file to force Swift libraries to link properly' - run: touch dist/envoy_ios_cocoapods/Envoy.framework/Swift/Empty.swift - - uses: actions/upload-artifact@v2 - with: - name: envoy_ios_cocoapods - path: dist/envoy_ios_cocoapods + name: ios_framework + path: ./ios_framework.zip create_github_release: name: create_github_release runs-on: ubuntu-latest timeout-minutes: 45 - needs: [android_release_artifacts, ios_release_artifacts_framework, ios_release_artifacts_cocoapods] + needs: [android_release_artifacts, ios_release_artifacts] steps: - - uses: actions/checkout@v1 - with: - submodules: true - uses: actions/download-artifact@v3 with: name: envoy_android_aar_sources - path: ./envoy_android_aar_sources.tar.gz - - uses: actions/download-artifact@v3 - with: - name: envoy_ios_framework - path: ./envoy_ios_framework.zip - uses: actions/download-artifact@v3 with: - name: envoy_ios_cocoapods - path: ./envoy_ios_cocoapods.zip + name: ios_framework - name: Release uses: softprops/action-gh-release@v1 with: files: | envoy_android_aar_sources.tar.gz - envoy_ios_framework.zip - envoy_ios_cocoapods.zip + ios_framework.zip publish_to_cocoapods: name: publish_to_cocoapods diff --git a/BUILD b/BUILD index 6a3cbca360..8052b3652c 100644 --- a/BUILD +++ b/BUILD @@ -8,6 +8,12 @@ alias( visibility = ["//visibility:public"], ) +alias( + name = "ios_xcframework", + actual = "//library/swift:Envoy", + visibility = ["//visibility:public"], +) + genrule( name = "ios_dist", srcs = [":ios_framework"], diff --git a/EnvoyMobile.podspec b/EnvoyMobile.podspec index 813face32f..6ae6660d6f 100644 --- a/EnvoyMobile.podspec +++ b/EnvoyMobile.podspec @@ -6,13 +6,12 @@ Pod::Spec.new do |s| s.homepage = 'https://envoy-mobile.github.io' s.documentation_url = 'https://envoy-mobile.github.io/docs/envoy-mobile/latest/index.html' s.social_media_url = 'https://twitter.com/EnvoyProxy' - s.license = { type: 'Apache-2.0', file: 'LICENSE' } + s.license = { type: 'Apache-2.0', file: 'ios_framework/LICENSE' } s.platform = :ios, '12.0' s.swift_versions = ['5.5', '5.6'] s.libraries = 'resolv.9', 'c++' s.frameworks = 'Network', 'SystemConfiguration', 'UIKit' - s.source = { http: "https://github.com/envoyproxy/envoy-mobile/releases/download/v#{s.version}/envoy_ios_cocoapods.zip" } - s.vendored_frameworks = 'Envoy.framework' - s.source_files = 'Envoy.framework/Headers/*.h', 'Envoy.framework/Swift/*.swift' + s.source = { http: "https://github.com/envoyproxy/envoy-mobile/releases/download/v#{s.version}/ios_framework.zip" } + s.vendored_frameworks = 'ios_framework/Envoy.xcframework' s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' } end diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst index 9634595cd5..d3289fe4fb 100644 --- a/docs/root/intro/version_history.rst +++ b/docs/root/intro/version_history.rst @@ -6,6 +6,22 @@ Pending Release Breaking changes: +- None + +Bugfixes: + +- iOS: change release artifacts to use xcframeworks (:issue:`#2216 <2216>`) +- iOS: fix CocoaPods releases (:issue:`#2215 <2215>`) + +Features: + +- None + +0.4.6 (April 26, 2022) +======================== + +Breaking changes: + - iOS: the minimum supported iOS version is now 12.0 (:issue:`#2084 <2084>`) Bugfixes: diff --git a/library/swift/BUILD b/library/swift/BUILD index 9b4e9ca645..5c6d1c7fa6 100644 --- a/library/swift/BUILD +++ b/library/swift/BUILD @@ -1,4 +1,5 @@ load("//bazel:config.bzl", "MINIMUM_IOS_VERSION") +load("@build_bazel_rules_apple//apple:apple.bzl", "apple_xcframework") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_static_framework") load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") load("//bazel:swift_header_collector.bzl", "swift_header_collector") @@ -74,3 +75,30 @@ ios_static_framework( visibility = ["//visibility:public"], deps = ["ios_lib"], ) + +apple_xcframework( + name = "Envoy", + bundle_id = "io.envoyproxy.envoymobile", + infoplists = [ + "//library/swift/resources:Info.plist", + ], + ios = { + "simulator": [ + "arm64", + "x86_64", + ], + "device": [ + "arm64", + ], + }, + minimum_os_versions = { + "ios": MINIMUM_IOS_VERSION, + }, + # Currently the framework is over 2GB, and is not worth caching + tags = [ + "no-cache", + "no-remote", + ], + visibility = ["//visibility:public"], + deps = ["ios_lib"], +) diff --git a/library/swift/resources/BUILD b/library/swift/resources/BUILD new file mode 100644 index 0000000000..89e764a88d --- /dev/null +++ b/library/swift/resources/BUILD @@ -0,0 +1,6 @@ +licenses(["notice"]) + +exports_files( + ["Info.plist"], + visibility = ["//visibility:public"], +) diff --git a/library/swift/resources/Info.plist b/library/swift/resources/Info.plist new file mode 100644 index 0000000000..10fc093cff --- /dev/null +++ b/library/swift/resources/Info.plist @@ -0,0 +1,16 @@ + + + + + CFBundleName + $(PRODUCT_NAME) + CFBundleVersion + 1.0 + CFBundleShortVersionString + 1.0 + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + + From 5f8f0a426af1727fe37b1ad37b19f23ad944a3f4 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 26 Apr 2022 20:07:26 -0400 Subject: [PATCH 02/12] Reference `Info.plist` directly Signed-off-by: JP Simard --- library/swift/BUILD | 2 +- library/swift/resources/BUILD | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 library/swift/resources/BUILD diff --git a/library/swift/BUILD b/library/swift/BUILD index 5c6d1c7fa6..074ed2e528 100644 --- a/library/swift/BUILD +++ b/library/swift/BUILD @@ -80,7 +80,7 @@ apple_xcframework( name = "Envoy", bundle_id = "io.envoyproxy.envoymobile", infoplists = [ - "//library/swift/resources:Info.plist", + "resources/Info.plist", ], ios = { "simulator": [ diff --git a/library/swift/resources/BUILD b/library/swift/resources/BUILD deleted file mode 100644 index 89e764a88d..0000000000 --- a/library/swift/resources/BUILD +++ /dev/null @@ -1,6 +0,0 @@ -licenses(["notice"]) - -exports_files( - ["Info.plist"], - visibility = ["//visibility:public"], -) From 629d3dbf305cc1f83d677f6469b7429a858da00a Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 26 Apr 2022 21:01:41 -0400 Subject: [PATCH 03/12] apple_static_xcframework Update rules_apple to have xcframework improvements https://github.com/bazelbuild/rules_apple/pull/1443 Signed-off-by: JP Simard --- bazel/envoy_mobile_repositories.bzl | 6 ++++-- library/swift/BUILD | 8 ++------ library/swift/resources/Info.plist | 16 ---------------- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 library/swift/resources/Info.plist diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index cf5dea57e0..1e5510c48e 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -70,10 +70,12 @@ def upstream_envoy_overrides(): ) def swift_repos(): + # https://github.com/bazelbuild/rules_apple/pull/1443 http_archive( name = "build_bazel_rules_apple", - sha256 = "4161b2283f80f33b93579627c3bd846169b2d58848b0ffb29b5d4db35263156a", - url = "https://github.com/bazelbuild/rules_apple/releases/download/0.34.0/rules_apple.0.34.0.tar.gz", + sha256 = "01ace22f26dcc1e074834c138e0e24c4a81fd9ddd6accf2ac84fa40826864611", + strip_prefix = "rules_apple-5034fa27dae535f7d2b1a17eb607590c56f5248f", + url = "https://github.com/bazelbuild/rules_apple/archive/5034fa27dae535f7d2b1a17eb607590c56f5248f.tar.gz", ) http_archive( diff --git a/library/swift/BUILD b/library/swift/BUILD index 074ed2e528..680c443fef 100644 --- a/library/swift/BUILD +++ b/library/swift/BUILD @@ -1,5 +1,5 @@ load("//bazel:config.bzl", "MINIMUM_IOS_VERSION") -load("@build_bazel_rules_apple//apple:apple.bzl", "apple_xcframework") +load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_xcframework") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_static_framework") load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") load("//bazel:swift_header_collector.bzl", "swift_header_collector") @@ -76,12 +76,8 @@ ios_static_framework( deps = ["ios_lib"], ) -apple_xcframework( +apple_static_xcframework( name = "Envoy", - bundle_id = "io.envoyproxy.envoymobile", - infoplists = [ - "resources/Info.plist", - ], ios = { "simulator": [ "arm64", diff --git a/library/swift/resources/Info.plist b/library/swift/resources/Info.plist deleted file mode 100644 index 10fc093cff..0000000000 --- a/library/swift/resources/Info.plist +++ /dev/null @@ -1,16 +0,0 @@ - - - - - CFBundleName - $(PRODUCT_NAME) - CFBundleVersion - 1.0 - CFBundleShortVersionString - 1.0 - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - - From b43930d474b88835c25cb610c0f4d58086e03309 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 27 Apr 2022 15:00:18 -0400 Subject: [PATCH 04/12] Update .bazelversion to `6.0.0-pre.20220414.2` Started a conversation in the Envoy Slack about adopting rolling bazel releases in general: https://envoyproxy.slack.com/archives/C7E6C71QB/p1651089150478729 It would be nice to stay in sync with Envoy to avoid any incompatibilities. Signed-off-by: JP Simard --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 120000 => 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion deleted file mode 120000 index 9da24ef26b..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -envoy/.bazelversion \ No newline at end of file diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 0000000000..864f3a11f2 --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +6.0.0-pre.20220414.2 From 5996d9956209bcf7107ae8c2f4cd1aff440acfee Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 27 Apr 2022 16:54:08 -0400 Subject: [PATCH 05/12] Update rules_apple to latest PR commit Signed-off-by: JP Simard --- bazel/envoy_mobile_repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index 1e5510c48e..c1d416cec9 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -73,9 +73,9 @@ def swift_repos(): # https://github.com/bazelbuild/rules_apple/pull/1443 http_archive( name = "build_bazel_rules_apple", - sha256 = "01ace22f26dcc1e074834c138e0e24c4a81fd9ddd6accf2ac84fa40826864611", - strip_prefix = "rules_apple-5034fa27dae535f7d2b1a17eb607590c56f5248f", - url = "https://github.com/bazelbuild/rules_apple/archive/5034fa27dae535f7d2b1a17eb607590c56f5248f.tar.gz", + sha256 = "be40bb0a34387085a4ffa65e25787dcf53927e5b20a48f431d72d6482fc64178", + strip_prefix = "rules_apple-7bbd037463eea1179c9740676cdf27df9a13659b", + url = "https://github.com/bazelbuild/rules_apple/archive/7bbd037463eea1179c9740676cdf27df9a13659b.tar.gz", ) http_archive( From 1e6260cce65b8716f54c99f91900bada2a130ed8 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 27 Apr 2022 16:56:11 -0400 Subject: [PATCH 06/12] Only modify bazel version when building the iOS release Signed-off-by: JP Simard --- .bazelversion | 2 +- .github/workflows/release.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 120000 .bazelversion diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index 864f3a11f2..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -6.0.0-pre.20220414.2 diff --git a/.bazelversion b/.bazelversion new file mode 120000 index 0000000000..9da24ef26b --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +envoy/.bazelversion \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79ccd7db79..7da26f6634 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -110,6 +110,9 @@ jobs: submodules: true - name: 'Install dependencies' run: ./ci/mac_ci_setup.sh + - name: 'Bump Bazel version' + # TODO(jpsim): Get static xcframeworks working without needing to override the bazel version + run: echo "6.0.0-pre.20220414.2" > .bazelversion - name: 'Build Envoy.xcframework' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9e27ac07c947ed84e628178d92a27ce351dc1f5d Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 28 Apr 2022 12:51:27 -0400 Subject: [PATCH 07/12] Produce two iOS release assets SwiftPM & CocoaPods expect different structures in the zip archive * SwiftPM needs the framework to be at the top-level of the zip file * CocoaPods needs the framework to be zipped in a folder including the license file Signed-off-by: JP Simard --- .github/workflows/release.yml | 24 +++++++++++++++++------- EnvoyMobile.podspec | 6 +++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7da26f6634..c40573a693 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,18 +122,24 @@ jobs: --config=remote-ci-macos \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ //:ios_xcframework + - name: 'Move Envoy.xcframework.zip' + run: mv bazel-bin/library/swift/Envoy.xcframework.zip . + - uses: actions/upload-artifact@v2 + with: + name: ios_framework + path: ./Envoy.xcframework.zip - name: 'Create temporary directory for artifact to produce properly named zip' - run: mkdir ios_framework + run: mkdir ios_framework_cocoapods - name: 'Unzip framework to archive directory' - run: unzip bazel-bin/library/swift/Envoy.xcframework.zip -d ios_framework + run: unzip Envoy.xcframework.zip -d ios_framework_cocoapods - name: 'Copy LICENSE to archive directory' - run: cp LICENSE ios_framework + run: cp LICENSE ios_framework_cocoapods - name: 'Zip archive directory' - run: zip -r ios_framework.zip ios_framework + run: zip -r ios_framework_cocoapods.zip ios_framework_cocoapods - uses: actions/upload-artifact@v2 with: - name: ios_framework - path: ./ios_framework.zip + name: ios_framework_cocoapods + path: ./ios_framework_cocoapods.zip create_github_release: name: create_github_release @@ -147,12 +153,16 @@ jobs: - uses: actions/download-artifact@v3 with: name: ios_framework + - uses: actions/download-artifact@v3 + with: + name: ios_framework_cocoapods - name: Release uses: softprops/action-gh-release@v1 with: files: | envoy_android_aar_sources.tar.gz - ios_framework.zip + Envoy.xcframework.zip + ios_framework_cocoapods.zip publish_to_cocoapods: name: publish_to_cocoapods diff --git a/EnvoyMobile.podspec b/EnvoyMobile.podspec index 6ae6660d6f..29dfb309a2 100644 --- a/EnvoyMobile.podspec +++ b/EnvoyMobile.podspec @@ -6,12 +6,12 @@ Pod::Spec.new do |s| s.homepage = 'https://envoy-mobile.github.io' s.documentation_url = 'https://envoy-mobile.github.io/docs/envoy-mobile/latest/index.html' s.social_media_url = 'https://twitter.com/EnvoyProxy' - s.license = { type: 'Apache-2.0', file: 'ios_framework/LICENSE' } + s.license = { type: 'Apache-2.0', file: 'ios_framework_cocoapods/LICENSE' } s.platform = :ios, '12.0' s.swift_versions = ['5.5', '5.6'] s.libraries = 'resolv.9', 'c++' s.frameworks = 'Network', 'SystemConfiguration', 'UIKit' - s.source = { http: "https://github.com/envoyproxy/envoy-mobile/releases/download/v#{s.version}/ios_framework.zip" } - s.vendored_frameworks = 'ios_framework/Envoy.xcframework' + s.source = { http: "https://github.com/envoyproxy/envoy-mobile/releases/download/v#{s.version}/ios_framework_cocoapods.zip" } + s.vendored_frameworks = 'ios_framework_cocoapods/Envoy.xcframework' s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' } end From 90b0e9968adcc995e628bd45af6b64a8c20936c2 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 28 Apr 2022 12:57:11 -0400 Subject: [PATCH 08/12] Update rules_apple again Signed-off-by: JP Simard --- bazel/envoy_mobile_repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index c1d416cec9..354340f6e8 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -73,9 +73,9 @@ def swift_repos(): # https://github.com/bazelbuild/rules_apple/pull/1443 http_archive( name = "build_bazel_rules_apple", - sha256 = "be40bb0a34387085a4ffa65e25787dcf53927e5b20a48f431d72d6482fc64178", - strip_prefix = "rules_apple-7bbd037463eea1179c9740676cdf27df9a13659b", - url = "https://github.com/bazelbuild/rules_apple/archive/7bbd037463eea1179c9740676cdf27df9a13659b.tar.gz", + sha256 = "6969b74711ee0129d558f59790abc5e4ba0503878047a8813b5a7e532fc80e6b", + strip_prefix = "rules_apple-694d87902ca5e5134445566aebf34d5a6b9c828c", + url = "https://github.com/bazelbuild/rules_apple/archive/694d87902ca5e5134445566aebf34d5a6b9c828c.tar.gz", ) http_archive( From a12d44c958b43c951c949082eeb7ba63c031a414 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 28 Apr 2022 13:16:44 -0400 Subject: [PATCH 09/12] Build release artifacts on PRs and main commits to validate Signed-off-by: JP Simard --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c40573a693..dd36cd9f74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,11 @@ name: release on: push: + branches: + - main tags: - v* + pull_request: jobs: android_release_artifacts: @@ -42,6 +45,7 @@ jobs: android_release_deploy: name: android_release_deploy + if: startsWith(github.ref, 'refs/tags/v') needs: android_release_artifacts runs-on: ubuntu-18.04 timeout-minutes: 240 @@ -143,6 +147,7 @@ jobs: create_github_release: name: create_github_release + if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-latest timeout-minutes: 45 needs: [android_release_artifacts, ios_release_artifacts] @@ -166,6 +171,7 @@ jobs: publish_to_cocoapods: name: publish_to_cocoapods + if: startsWith(github.ref, 'refs/tags/v') runs-on: macos-12 timeout-minutes: 45 needs: create_github_release From c95ac252397beb357359a6079c881acb23d3a93a Mon Sep 17 00:00:00 2001 From: JP Simard Date: Mon, 2 May 2022 15:19:17 -0400 Subject: [PATCH 10/12] Update to latest rules_apple HEAD Signed-off-by: JP Simard --- bazel/envoy_mobile_repositories.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index c492901983..43154b70d1 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -70,10 +70,12 @@ def upstream_envoy_overrides(): ) def swift_repos(): + # https://github.com/bazelbuild/rules_apple/pull/1443 http_archive( name = "build_bazel_rules_apple", - sha256 = "12865e5944f09d16364aa78050366aca9dc35a32a018fa35f5950238b08bf744", - url = "https://github.com/bazelbuild/rules_apple/releases/download/0.34.2/rules_apple.0.34.2.tar.gz", + sha256 = "d53086f093ad9386fff74a89e6b30b0adc5d96348fc0e7bb60fa0fd943073c72", + strip_prefix = "rules_apple-c9d6a570cfb0308648f227115ae60298e1e17700", + url = "https://github.com/bazelbuild/rules_apple/archive/c9d6a570cfb0308648f227115ae60298e1e17700.tar.gz", ) http_archive( From c433ea413c56a2979bee838b6b403f416d0f53a4 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Mon, 2 May 2022 15:29:42 -0400 Subject: [PATCH 11/12] Reset envoy submodule to what's on main Signed-off-by: JP Simard --- envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy b/envoy index 03f23769d1..d0befbbb95 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit 03f23769d19e1baaf37fe52dcfe3f840429f9d06 +Subproject commit d0befbbb952c979782857bdb986bec562d9a3c2f From cabbc00c45f077ba33ca626c87ff210bdd196e28 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 10 May 2022 17:24:33 -0400 Subject: [PATCH 12/12] Fix release.yml GitHub Actions workflow Signed-off-by: JP Simard --- .github/workflows/release.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0445190414..bc850fe254 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,18 +123,9 @@ jobs: --config=remote-ci-macos \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ //:ios_xcframework + - name: 'Move Envoy.xcframework.zip' + run: mv bazel-bin/library/swift/Envoy.xcframework.zip . - uses: actions/upload-artifact@v2 - with: - name: envoy_ios_framework - path: bazel-bin/library/swift/ios_framework.zip - - ios_release_artifacts_cocoapods: - name: ios_release_artifacts_cocoapods - runs-on: macos-12 - timeout-minutes: 45 - needs: [ios_release_artifacts_framework] - steps: - - uses: actions/checkout@v1 with: name: ios_framework path: ./Envoy.xcframework.zip