From 46584c2aa188cf979106f62bde7837dc9499252c Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 9 Dec 2024 16:55:32 +0100 Subject: [PATCH] Moving fixes --- .github/labeler.yml | 4 +++ .github/workflows/clock.yaml | 4 +-- .../workflows/markdown.yaml | 18 ++++++++-- .../workflows/markdown_crash_test.yaml | 6 ++++ .../workflows/markdown_flutter.yaml | 32 +++++++++++------ README.md | 1 + pkgs/markdown/.github/dependabot.yaml | 14 -------- .../.github/workflows/no-response.yml | 35 ------------------- pkgs/markdown/.github/workflows/publish.yaml | 14 -------- pkgs/markdown/CHANGELOG.md | 4 +++ pkgs/markdown/README.md | 5 ++- pkgs/markdown/pubspec.yaml | 2 +- 12 files changed, 57 insertions(+), 82 deletions(-) rename pkgs/markdown/.github/workflows/test-package.yml => .github/workflows/markdown.yaml (89%) rename pkgs/markdown/.github/workflows/crash_test.yaml => .github/workflows/markdown_crash_test.yaml (89%) rename pkgs/markdown/.github/workflows/flutter_markdown.yaml => .github/workflows/markdown_flutter.yaml (73%) delete mode 100644 pkgs/markdown/.github/dependabot.yaml delete mode 100644 pkgs/markdown/.github/workflows/no-response.yml delete mode 100644 pkgs/markdown/.github/workflows/publish.yaml diff --git a/.github/labeler.yml b/.github/labeler.yml index 45c2239b1..e1587374b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -68,6 +68,10 @@ - changed-files: - any-glob-to-any-file: 'pkgs/json_rpc_2/**' +'package:markdown': + - changed-files: + - any-glob-to-any-file: 'pkgs/markdown/**' + 'package:mime': - changed-files: - any-glob-to-any-file: 'pkgs/mime/**' diff --git a/.github/workflows/clock.yaml b/.github/workflows/clock.yaml index aef089513..a09a6010c 100644 --- a/.github/workflows/clock.yaml +++ b/.github/workflows/clock.yaml @@ -5,12 +5,12 @@ on: push: branches: [ main ] paths: - - '.github/workflows/clock.yml' + - '.github/workflows/clock.yaml' - 'pkgs/clock/**' pull_request: branches: [ main ] paths: - - '.github/workflows/clock.yml' + - '.github/workflows/clock.yaml' - 'pkgs/clock/**' schedule: - cron: "0 0 * * 0" diff --git a/pkgs/markdown/.github/workflows/test-package.yml b/.github/workflows/markdown.yaml similarity index 89% rename from pkgs/markdown/.github/workflows/test-package.yml rename to .github/workflows/markdown.yaml index df2accc54..84838f509 100644 --- a/pkgs/markdown/.github/workflows/test-package.yml +++ b/.github/workflows/markdown.yaml @@ -1,17 +1,29 @@ -name: Dart CI +name: package:markdown on: # Run on PRs and pushes to the default branch. push: - branches: [ master ] + branches: [ main ] + paths: + - '.github/workflows/markdown.yaml' + - 'pkgs/markdown/**' pull_request: - branches: [ master ] + branches: [ main ] + paths: + - '.github/workflows/markdown.yaml' + - 'pkgs/markdown/**' schedule: - cron: "0 0 * * 0" env: PUB_ENVIRONMENT: bot.github + +defaults: + run: + working-directory: pkgs/markdown/ + + jobs: # Check code formatting and static analysis on a single OS (linux) # against Dart dev. diff --git a/pkgs/markdown/.github/workflows/crash_test.yaml b/.github/workflows/markdown_crash_test.yaml similarity index 89% rename from pkgs/markdown/.github/workflows/crash_test.yaml rename to .github/workflows/markdown_crash_test.yaml index 966bf11b5..4d83482fb 100644 --- a/pkgs/markdown/.github/workflows/crash_test.yaml +++ b/.github/workflows/markdown_crash_test.yaml @@ -7,6 +7,10 @@ on: schedule: # “At 00:00 (UTC) on Sunday.” - cron: '0 0 * * 0' + +defaults: + run: + working-directory: pkgs/markdown/ jobs: crash-test: @@ -14,7 +18,9 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + - name: Install dependencies run: dart pub get + - name: Run crash_test.dart run: dart test -P crash_test test/crash_test.dart diff --git a/pkgs/markdown/.github/workflows/flutter_markdown.yaml b/.github/workflows/markdown_flutter.yaml similarity index 73% rename from pkgs/markdown/.github/workflows/flutter_markdown.yaml rename to .github/workflows/markdown_flutter.yaml index 2c77ea5f8..fc15c4bcd 100644 --- a/pkgs/markdown/.github/workflows/flutter_markdown.yaml +++ b/.github/workflows/markdown_flutter.yaml @@ -1,17 +1,29 @@ # Run a smoke test against package:flutter_markdown. -name: flutter_markdown +name: markdown_flutter on: - schedule: - # “At 00:00 (UTC) on Sunday.” - - cron: '0 0 * * 0' + # Run on PRs and pushes to the default branch. push: - branches: [ master ] + branches: [ main ] + paths: + - '.github/workflows/markdown.yaml' + - 'pkgs/markdown/**' pull_request: - branches: [ master ] + branches: [ main ] + paths: + - '.github/workflows/markdown.yaml' + - 'pkgs/markdown/**' + schedule: + - cron: "0 0 * * 0" + +env: + PUB_ENVIRONMENT: bot.github + -permissions: read-all +defaults: + run: + working-directory: pkgs/markdown/ jobs: smoke-test: @@ -21,8 +33,8 @@ jobs: - name: clone dart-lang/markdown uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: - repository: dart-lang/markdown - path: markdown + repository: dart-lang/tools + path: tools_repo - name: clone flutter/packages uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -44,7 +56,7 @@ jobs: run: | echo "dependency_overrides:" > pubspec_overrides.yaml echo " markdown:" >> pubspec_overrides.yaml - echo " path: ../../../markdown" >> pubspec_overrides.yaml + echo " path: ../../../tools_repo/pkgs/markdown" >> pubspec_overrides.yaml - name: flutter pub get working-directory: flutter_packages/packages/flutter_markdown diff --git a/README.md b/README.md index ed90416dd..91c85e5c2 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ don't naturally belong to other topic monorepos (like | [graphs](pkgs/graphs/) | Graph algorithms that operate on graphs in any representation. | [![package issues](https://img.shields.io/badge/package:graphs-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Agraphs) | [![pub package](https://img.shields.io/pub/v/graphs.svg)](https://pub.dev/packages/graphs) | | [html](pkgs/html/) | APIs for parsing and manipulating HTML content outside the browser. | [![package issues](https://img.shields.io/badge/package:html-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ahtml) | [![pub package](https://img.shields.io/pub/v/html.svg)](https://pub.dev/packages/html) | | [json_rpc_2](pkgs/json_rpc_2/) | Utilities to write a client or server using the JSON-RPC 2.0 spec. | [![package issues](https://img.shields.io/badge/package:json_rpc_2-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ajson_rpc_2) | [![pub package](https://img.shields.io/pub/v/json_rpc_2.svg)](https://pub.dev/packages/json_rpc_2) | +| [markdown](pkgs/markdown/) | A portable Markdown library written in Dart that can parse Markdown into HTML. | [![pub package](https://img.shields.io/pub/v/markdown.svg)](https://pub.dev/packages/markdown) | | [mime](pkgs/mime/) | Utilities for handling media (MIME) types, including determining a type from a file extension and file contents. | [![package issues](https://img.shields.io/badge/package:mime-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Amime) | [![pub package](https://img.shields.io/pub/v/mime.svg)](https://pub.dev/packages/mime) | | [oauth2](pkgs/oauth2/) | A client library for authenticating with a remote service via OAuth2 on behalf of a user, and making authorized HTTP requests with the user's OAuth2 credentials. | [![package issues](https://img.shields.io/badge/package:oauth2-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aoauth2) | [![pub package](https://img.shields.io/pub/v/oauth2.svg)](https://pub.dev/packages/oauth2) | | [source_map_stack_trace](pkgs/source_map_stack_trace/) | A package for applying source maps to stack traces. | [![package issues](https://img.shields.io/badge/package:source_map_stack_trace-4774bc)](https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Asource_map_stack_trace) | [![pub package](https://img.shields.io/pub/v/source_map_stack_trace.svg)](https://pub.dev/packages/source_map_stack_trace) | diff --git a/pkgs/markdown/.github/dependabot.yaml b/pkgs/markdown/.github/dependabot.yaml deleted file mode 100644 index bf6b38a4d..000000000 --- a/pkgs/markdown/.github/dependabot.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# Dependabot configuration file. -version: 2 - -updates: - - package-ecosystem: github-actions - directory: / - schedule: - interval: monthly - labels: - - autosubmit - groups: - github-actions: - patterns: - - "*" diff --git a/pkgs/markdown/.github/workflows/no-response.yml b/pkgs/markdown/.github/workflows/no-response.yml deleted file mode 100644 index 1a6f2ecdd..000000000 --- a/pkgs/markdown/.github/workflows/no-response.yml +++ /dev/null @@ -1,35 +0,0 @@ -# A workflow to close issues where the author hasn't responded to a request for -# more information; see https://github.com/actions/stale. - -name: No Response - -# Run as a daily cron. -on: - schedule: - # Every day at 8am - - cron: '0 8 * * *' - -# All permissions not specified are set to 'none'. -permissions: - issues: write - pull-requests: write - -jobs: - no-response: - runs-on: ubuntu-latest - if: ${{ github.repository_owner == 'dart-lang' }} - steps: - - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e - with: - days-before-stale: -1 - days-before-close: 14 - stale-issue-label: "needs-info" - close-issue-message: > - Without additional information we're not able to resolve this issue. - Feel free to add more info or respond to any questions above and we - can reopen the case. Thanks for your contribution! - stale-pr-label: "needs-info" - close-pr-message: > - Without additional information we're not able to resolve this PR. - Feel free to add more info or respond to any questions above. - Thanks for your contribution! diff --git a/pkgs/markdown/.github/workflows/publish.yaml b/pkgs/markdown/.github/workflows/publish.yaml deleted file mode 100644 index fcb7ccb89..000000000 --- a/pkgs/markdown/.github/workflows/publish.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# A CI configuration to auto-publish pub packages. - -name: Publish - -on: - pull_request: - branches: [ master ] - push: - tags: [ 'v[0-9]+.[0-9]+.[0-9]+*' ] - -jobs: - publish: - if: ${{ github.repository_owner == 'dart-lang' }} - uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main diff --git a/pkgs/markdown/CHANGELOG.md b/pkgs/markdown/CHANGELOG.md index 04d3d9a78..1d82f4693 100644 --- a/pkgs/markdown/CHANGELOG.md +++ b/pkgs/markdown/CHANGELOG.md @@ -1,3 +1,7 @@ +## 7.2.4 + +* Move to `dart-lang/tools` monorepo. + ## 7.2.3 * Fix an issue with checkbox list items separated with blank lines (#602). diff --git a/pkgs/markdown/README.md b/pkgs/markdown/README.md index b1c869546..3b87484d1 100644 --- a/pkgs/markdown/README.md +++ b/pkgs/markdown/README.md @@ -1,7 +1,6 @@ -[![Build Status](https://github.com/dart-lang/markdown/workflows/Dart%20CI/badge.svg)](https://github.com/dart-lang/markdown/actions?query=workflow%3A"Dart+CI"+branch%3Amaster) -[![Pub](https://img.shields.io/pub/v/markdown.svg)](https://pub.dev/packages/markdown) +[![Build Status](https://github.com/dart-lang/tools/actions/workflows/markdown.yaml/badge.svg)](https://github.com/dart-lang/tools/actions/workflows/markdown.yaml) +[![pub package](https://img.shields.io/pub/v/markdown.svg)](https://pub.dev/packages/markdown) [![package publisher](https://img.shields.io/pub/publisher/markdown.svg)](https://pub.dev/packages/markdown/publisher) -[![Coverage Status](https://coveralls.io/repos/github/dart-lang/markdown/badge.svg?branch=master)](https://coveralls.io/github/dart-lang/markdown?branch=master) A portable Markdown library written in Dart. It can parse Markdown into HTML on both the client and server. diff --git a/pkgs/markdown/pubspec.yaml b/pkgs/markdown/pubspec.yaml index dba7d5742..410051cf5 100644 --- a/pkgs/markdown/pubspec.yaml +++ b/pkgs/markdown/pubspec.yaml @@ -1,5 +1,5 @@ name: markdown -version: 7.2.3 +version: 7.2.4 description: >- A portable Markdown library written in Dart that can parse Markdown into HTML. repository: https://github.com/dart-lang/tools/tree/main/pkgs/markdown