From 9ecbcf22a8cd4553bf25d9961e6d0a4873f0d30b Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:03:01 +0000 Subject: [PATCH 1/9] Add a workflow for publishing flutter packages Closes #1259 Add a second copy of the publish workflow with `use-flutter: true`. Add `ignore-packages` to both workflows to ignore published packages for the non-relevant SDK. --- .github/workflows/publish.yaml | 3 ++- .github/workflows/publish_flutter.yaml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/publish_flutter.yaml diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f0cc574ccc..cd42d16f7e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,6 +1,6 @@ # A CI configuration to auto-publish pub packages. -name: Publish +name: Publish Dart Packages on: pull_request: @@ -15,3 +15,4 @@ jobs: permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note + ignore-packages: pkgs/cupertino_http/,pkgs/cronet_http/,pkgs/ok_http/ diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml new file mode 100644 index 0000000000..82fc19085d --- /dev/null +++ b/.github/workflows/publish_flutter.yaml @@ -0,0 +1,19 @@ +# A CI configuration to auto-publish pub packages. + +name: Publish Flutter Packages + +on: + pull_request: + branches: [ master ] + push: + tags: [ '[A-z]+-v[0-9]+.[0-9]+.[0-9]+' ] + +jobs: + publish: + if: ${{ github.repository_owner == 'dart-lang' }} + uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main + permissions: + id-token: write # Required for authentication using OIDC + pull-requests: write # Required for writing the pull request note + use-flutter: true + ignore-packages: pkgs/http/,pkgs/http_profile/,pkgs/web_socket/, From 341df34e9722eb2bf7a342a3fb2a91858af007ca Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:16:43 +0000 Subject: [PATCH 2/9] Move config to "with" section --- .github/workflows/publish.yaml | 3 ++- .github/workflows/publish_flutter.yaml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index cd42d16f7e..fb40c51402 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -12,7 +12,8 @@ jobs: publish: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main + with: + ignore-packages: pkgs/cupertino_http/,pkgs/cronet_http/,pkgs/ok_http/ permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note - ignore-packages: pkgs/cupertino_http/,pkgs/cronet_http/,pkgs/ok_http/ diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index 82fc19085d..cd659c21e4 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -12,8 +12,9 @@ jobs: publish: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main + with: + use-flutter: true + ignore-packages: pkgs/http/,pkgs/http_profile/,pkgs/web_socket/, permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note - use-flutter: true - ignore-packages: pkgs/http/,pkgs/http_profile/,pkgs/web_socket/, From 5461fb92bddf5269f04d88e0ed2fa2762bae5070 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:21:28 +0000 Subject: [PATCH 3/9] Yaml list format It looked like it was specified as a string, so I assumed we should use the comma separated format as if it were passed as a CLI arg, but that doesn't seem to have any effect. --- .github/workflows/publish.yaml | 5 ++++- .github/workflows/publish_flutter.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fb40c51402..f3108c65a8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,7 +13,10 @@ jobs: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: - ignore-packages: pkgs/cupertino_http/,pkgs/cronet_http/,pkgs/ok_http/ + ignore-packages: + - pkgs/cupertino_http/ + - pkgs/cronet_http/ + - pkgs/ok_http/ permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index cd659c21e4..13cc039b6c 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -14,7 +14,10 @@ jobs: uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: use-flutter: true - ignore-packages: pkgs/http/,pkgs/http_profile/,pkgs/web_socket/, + ignore-packages: + - pkgs/http/ + - pkgs/http_profile/ + - pkgs/web_socket/ permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note From 59652e3cc292b574db0ff29164462bb2ae4cfbe7 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:25:53 +0000 Subject: [PATCH 4/9] Try a string with newlines? Github actions don't support yaml lists? --- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/publish_flutter.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f3108c65a8..b0826ceb3e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,10 +13,10 @@ jobs: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: - ignore-packages: - - pkgs/cupertino_http/ - - pkgs/cronet_http/ - - pkgs/ok_http/ + ignore-packages: | + pkgs/cupertino_http/ + pkgs/cronet_http/ + pkgs/ok_http/ permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index 13cc039b6c..b995d4b0a9 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -14,10 +14,10 @@ jobs: uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: use-flutter: true - ignore-packages: - - pkgs/http/ - - pkgs/http_profile/ - - pkgs/web_socket/ + ignore-packages: | + pkgs/http/ + pkgs/http_profile/ + pkgs/web_socket/ permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note From c7fb52290e057946b85fba7c97be8c7ea524bcca Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:30:06 +0000 Subject: [PATCH 5/9] More globby? --- .github/workflows/publish.yaml | 6 +++--- .github/workflows/publish_flutter.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b0826ceb3e..7cb8935497 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,9 +14,9 @@ jobs: uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: ignore-packages: | - pkgs/cupertino_http/ - pkgs/cronet_http/ - pkgs/ok_http/ + pkgs/cupertino_http/** + pkgs/cronet_http/** + pkgs/ok_http/** permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index b995d4b0a9..33705df207 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -15,9 +15,9 @@ jobs: with: use-flutter: true ignore-packages: | - pkgs/http/ - pkgs/http_profile/ - pkgs/web_socket/ + pkgs/http/** + pkgs/http_profile/** + pkgs/web_socket/** permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note From 2f8ad31863b3d61b10b5cb9edf32f51d852385b2 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:33:00 +0000 Subject: [PATCH 6/9] Less globby? --- .github/workflows/publish.yaml | 6 +++--- .github/workflows/publish_flutter.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7cb8935497..648954eab8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,9 +14,9 @@ jobs: uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: ignore-packages: | - pkgs/cupertino_http/** - pkgs/cronet_http/** - pkgs/ok_http/** + pkgs/cupertino_http + pkgs/cronet_http + pkgs/ok_http permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index 33705df207..48b47b17a7 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -15,9 +15,9 @@ jobs: with: use-flutter: true ignore-packages: | - pkgs/http/** - pkgs/http_profile/** - pkgs/web_socket/** + pkgs/http + pkgs/http_profile + pkgs/web_socket permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note From 0b2ca7c4a8e799a41aca8d10f341a5041c2b4866 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:34:23 +0000 Subject: [PATCH 7/9] Single line, no directory endings --- .github/workflows/publish.yaml | 5 +---- .github/workflows/publish_flutter.yaml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 648954eab8..b68158dc42 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,10 +13,7 @@ jobs: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: - ignore-packages: | - pkgs/cupertino_http - pkgs/cronet_http - pkgs/ok_http + ignore-packages: pkgs/cupertino_http,pkgs/cronet_http,pkgs/ok_http permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note diff --git a/.github/workflows/publish_flutter.yaml b/.github/workflows/publish_flutter.yaml index 48b47b17a7..b42393e091 100644 --- a/.github/workflows/publish_flutter.yaml +++ b/.github/workflows/publish_flutter.yaml @@ -14,10 +14,7 @@ jobs: uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main with: use-flutter: true - ignore-packages: | - pkgs/http - pkgs/http_profile - pkgs/web_socket + ignore-packages: pkgs/http,pkgs/http_profile,pkgs/web_socket permissions: id-token: write # Required for authentication using OIDC pull-requests: write # Required for writing the pull request note From 35f8076fe86e124b385573d1625a09211be17acc Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:39:03 +0000 Subject: [PATCH 8/9] Try bumping http version Does the comment show up on the PR? --- pkgs/http/CHANGELOG.md | 4 ++++ pkgs/http/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/http/CHANGELOG.md b/pkgs/http/CHANGELOG.md index 85dccd7313..d86c785fc9 100644 --- a/pkgs/http/CHANGELOG.md +++ b/pkgs/http/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.3 + +* Foo. DO NOT SUBMIT + ## 1.2.2 * Require package `web: '>=0.5.0 <2.0.0'`. diff --git a/pkgs/http/pubspec.yaml b/pkgs/http/pubspec.yaml index 7039e30838..5a922c804a 100644 --- a/pkgs/http/pubspec.yaml +++ b/pkgs/http/pubspec.yaml @@ -1,5 +1,5 @@ name: http -version: 1.2.2 +version: 1.2.3 description: A composable, multi-platform, Future-based API for HTTP requests. repository: https://github.com/dart-lang/http/tree/master/pkgs/http From f6741fa1172b04f94c126cb3f034f25020a5cc27 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 6 Aug 2024 00:40:33 +0000 Subject: [PATCH 9/9] Revert "Try bumping http version" This reverts commit 35f8076fe86e124b385573d1625a09211be17acc. --- pkgs/http/CHANGELOG.md | 4 ---- pkgs/http/pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/http/CHANGELOG.md b/pkgs/http/CHANGELOG.md index d86c785fc9..85dccd7313 100644 --- a/pkgs/http/CHANGELOG.md +++ b/pkgs/http/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.2.3 - -* Foo. DO NOT SUBMIT - ## 1.2.2 * Require package `web: '>=0.5.0 <2.0.0'`. diff --git a/pkgs/http/pubspec.yaml b/pkgs/http/pubspec.yaml index 5a922c804a..7039e30838 100644 --- a/pkgs/http/pubspec.yaml +++ b/pkgs/http/pubspec.yaml @@ -1,5 +1,5 @@ name: http -version: 1.2.3 +version: 1.2.2 description: A composable, multi-platform, Future-based API for HTTP requests. repository: https://github.com/dart-lang/http/tree/master/pkgs/http