From a4b245121ed7969a742375fe6d15791420ad469a Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Mon, 13 Mar 2023 15:15:32 -0400 Subject: [PATCH 01/15] Migrate to GH deploy pages action --- .github/workflows/build_and_deploy_docs.yml | 25 +++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml index 02469cf0..a54c4955 100644 --- a/.github/workflows/build_and_deploy_docs.yml +++ b/.github/workflows/build_and_deploy_docs.yml @@ -9,6 +9,11 @@ on: jobs: main: + # Grant GITHUB_TOKEN the permissions required to make a Pages deployment + permissions: + pages: write # to deploy to Pages + id-token: write # to verify the deployment originates from an appropriate source + runs-on: ubuntu-latest strategy: fail-fast: false @@ -28,17 +33,19 @@ jobs: run: pub global activate dartdoc && dartdoc --show-undocumented-categories if: ${{ matrix.sdk == '2.13.4' }} - - id: deploy-docs - name: Deploy Docs 🚀 - uses: JamesIves/github-pages-deploy-action@4.1.1 - with: - branch: gh-pages - folder: doc/api # Where the build step stores the dartdoc output - if: ${{ steps.build-docs.outcome == 'success' && github.event_name == 'push' }} - + # Upload the artifact as required by actions/deploy-pages - name: Archive Dartdoc Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-pages-artifact@v2 with: name: dartdoc path: doc/api/ if: ${{ steps.build-docs.outcome == 'success' && steps.deploy-docs.outcome == 'skipped' }} + + - id: deploy-docs + name: Deploy Docs 🚀 + uses: actions/deploy-pages@v1 + with: + artifact-name: dartdoc + if: ${{ steps.build-docs.outcome == 'success' && github.event_name == 'push' }} + + From 91c369ea4ecc02fb1ef33f11fe99802c3afd08f7 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 10:57:09 -0400 Subject: [PATCH 02/15] Remove dep override to non-existant branch --- pubspec.next.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pubspec.next.yaml b/pubspec.next.yaml index 1b675c51..29032881 100644 --- a/pubspec.next.yaml +++ b/pubspec.next.yaml @@ -26,7 +26,3 @@ dependency_overrides: git: url: https://github.com/workiva/react-dart.git ref: null-safety-manual - test_html_builder: - git: - url: https://github.com/workiva/test_html_builder.git - ref: v3_wip From b16c56cb187b104f49c35fbaf0f2932ec08d69ec Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:00:56 -0400 Subject: [PATCH 03/15] Fix action version --- .github/workflows/build_and_deploy_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml index a54c4955..d82690b6 100644 --- a/.github/workflows/build_and_deploy_docs.yml +++ b/.github/workflows/build_and_deploy_docs.yml @@ -35,7 +35,7 @@ jobs: # Upload the artifact as required by actions/deploy-pages - name: Archive Dartdoc Artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v1.0.7 with: name: dartdoc path: doc/api/ From 7d4ab4a616104f0cf8095ed7fbc78ab22a93709e Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:07:15 -0400 Subject: [PATCH 04/15] Bump version, tweak pub command --- .github/workflows/build_and_deploy_docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml index d82690b6..474bcc58 100644 --- a/.github/workflows/build_and_deploy_docs.yml +++ b/.github/workflows/build_and_deploy_docs.yml @@ -20,7 +20,7 @@ jobs: matrix: sdk: [ 2.13.4 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1 with: sdk: ${{ matrix.sdk }} @@ -30,7 +30,7 @@ jobs: - id: build-docs name: Build Docs - run: pub global activate dartdoc && dartdoc --show-undocumented-categories + run: dart pub global activate dartdoc && dartdoc --show-undocumented-categories if: ${{ matrix.sdk == '2.13.4' }} # Upload the artifact as required by actions/deploy-pages From 218aab59d9104562a8b513e362bb4bbf2efe05d5 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:21:22 -0400 Subject: [PATCH 05/15] Try bumping to v2.18.7 --- .github/workflows/build_and_deploy_docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml index 474bcc58..f53bcfb6 100644 --- a/.github/workflows/build_and_deploy_docs.yml +++ b/.github/workflows/build_and_deploy_docs.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.13.4 ] + sdk: [ 2.18.7 ] steps: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1 @@ -31,7 +31,7 @@ jobs: - id: build-docs name: Build Docs run: dart pub global activate dartdoc && dartdoc --show-undocumented-categories - if: ${{ matrix.sdk == '2.13.4' }} + if: ${{ matrix.sdk == '2.18.7' }} # Upload the artifact as required by actions/deploy-pages - name: Archive Dartdoc Artifact From baa840e298c78bd561cb301b96ec40c971f16649 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:25:45 -0400 Subject: [PATCH 06/15] Bump pubspec sdk --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ac4a7c23..f831f7a3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th homepage: https://github.com/Workiva/react_testing_library/ documentation: https://workiva.github.io/react_testing_library environment: - sdk: ">=2.11.0 <3.0.0" + sdk: ">=2.18.4 <3.0.0" dependencies: color: ">=2.1.1 <4.0.0" From c7f4370fa9ab2f213c62f701092a37c3925f3f2e Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:30:04 -0400 Subject: [PATCH 07/15] Bump dockerfile image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 185e3dd5..8677e1ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM google/dart:2.13 +FROM google/dart:2.18 # Expose env vars for git ssh access ARG GIT_SSH_KEY From 8baf758e32b5715c79ea22e433d42db8dd590b63 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:33:46 -0400 Subject: [PATCH 08/15] .. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8677e1ac..3f52f31c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM google/dart:2.18 +FROM google/dart:2.18.4 # Expose env vars for git ssh access ARG GIT_SSH_KEY From 47f8ed589cea00eed6bf7406139db90a352fb262 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:38:04 -0400 Subject: [PATCH 09/15] Drop minimum for 2.13.4 support, migrate to new dart docker image --- Dockerfile | 3 ++- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f52f31c..5718031e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM google/dart:2.18.4 +#Use the new dart image as per: https://hub.docker.com/r/google/dart +FROM dart:2.18.4 # Expose env vars for git ssh access ARG GIT_SSH_KEY diff --git a/pubspec.yaml b/pubspec.yaml index f831f7a3..ac4a7c23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th homepage: https://github.com/Workiva/react_testing_library/ documentation: https://workiva.github.io/react_testing_library environment: - sdk: ">=2.18.4 <3.0.0" + sdk: ">=2.11.0 <3.0.0" dependencies: color: ">=2.1.1 <4.0.0" From 7174689f5a4b93e57b0f5d7f489b11e22e15aa15 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 11:57:09 -0400 Subject: [PATCH 10/15] Use new dart doc --- .github/workflows/build_and_deploy_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml index f53bcfb6..5021e98a 100644 --- a/.github/workflows/build_and_deploy_docs.yml +++ b/.github/workflows/build_and_deploy_docs.yml @@ -30,7 +30,7 @@ jobs: - id: build-docs name: Build Docs - run: dart pub global activate dartdoc && dartdoc --show-undocumented-categories + run: dart pub get && dart doc . if: ${{ matrix.sdk == '2.18.7' }} # Upload the artifact as required by actions/deploy-pages From a982b7bdbf1c7699021517207ce69a90cac336cc Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 12:14:04 -0400 Subject: [PATCH 11/15] Remove 2.13.4 support --- .github/workflows/dart_ci.yml | 41 +---------------------------------- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index e6230fa1..96dd0d93 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -47,43 +47,4 @@ jobs: dart run build_runner test -r -- -P concurrent-tests dart run build_runner test -r -- -P non-concurrent-tests timeout-minutes: 10 - if: ${{ always() && steps.install.outcome == 'success' }} - - build_legacy: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - sdk: [ 2.13.4 ] - steps: - - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v1 - with: - sdk: ${{ matrix.sdk }} - - - id: install - name: Install dependencies - run: pub get - timeout-minutes: 2 - - - name: Check formatting - run: dart format . -l 120 --set-exit-if-changed - if: ${{ always() && steps.install.outcome == 'success' }} - - - name: Analyze project source - run: dartanalyzer . - if: ${{ always() && steps.install.outcome == 'success' }} - - - name: Run tests (DDC) - run: | - pub run build_runner test -- -P concurrent-tests - pub run build_runner test -- -P non-concurrent-tests - timeout-minutes: 10 - if: ${{ always() && steps.install.outcome == 'success' }} - - - name: Run tests (dart2js) - run: | - pub run build_runner test -r -- -P concurrent-tests - pub run build_runner test -r -- -P non-concurrent-tests - timeout-minutes: 10 - if: ${{ always() && steps.install.outcome == 'success' }} + if: ${{ always() && steps.install.outcome == 'success' }} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index ac4a7c23..f831f7a3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th homepage: https://github.com/Workiva/react_testing_library/ documentation: https://workiva.github.io/react_testing_library environment: - sdk: ">=2.11.0 <3.0.0" + sdk: ">=2.18.4 <3.0.0" dependencies: color: ">=2.1.1 <4.0.0" From 02cceb8296a749686a11d4aa6d39a8c7a82fe2ca Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 12:44:42 -0400 Subject: [PATCH 12/15] Bump pubspec.next --- pubspec.next.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.next.yaml b/pubspec.next.yaml index 29032881..12855dbc 100644 --- a/pubspec.next.yaml +++ b/pubspec.next.yaml @@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th homepage: https://github.com/Workiva/react_testing_library/ documentation: https://workiva.github.io/react_testing_library environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.18.4 <3.0.0' dependencies: color: ">=2.1.1 <4.0.0" From 3a11e2c6d3513a9c69d9b318dad13d9a21ac4a1f Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 14 Mar 2023 13:59:41 -0400 Subject: [PATCH 13/15] Drop dev check, requires null-saftey mmigration --- .github/workflows/dart_ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index 96dd0d93..eed25037 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -12,11 +12,10 @@ on: jobs: build: runs-on: ubuntu-latest - continue-on-error: ${{ matrix.sdk == 'dev' }} # Don't fail the workflow if the only errors are in the dev channel strategy: fail-fast: false matrix: - sdk: [stable, dev] + sdk: [stable] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v1 From 360f05e24b73fd42f7c36c608875db72e351f879 Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 4 Apr 2023 13:03:10 -0400 Subject: [PATCH 14/15] Revert version range, readd legacy run --- .github/workflows/dart_ci.yml | 39 +++++++++++++++++++++++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index eed25037..9284da7a 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -46,4 +46,43 @@ jobs: dart run build_runner test -r -- -P concurrent-tests dart run build_runner test -r -- -P non-concurrent-tests timeout-minutes: 10 + if: ${{ always() && steps.install.outcome == 'success' }} + + build_legacy: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + sdk: [ 2.13.4 ] + steps: + - uses: actions/checkout@v2 + - uses: dart-lang/setup-dart@v1 + with: + sdk: ${{ matrix.sdk }} + + - id: install + name: Install dependencies + run: pub get + timeout-minutes: 2 + + - name: Check formatting + run: dart format . -l 120 --set-exit-if-changed + if: ${{ always() && steps.install.outcome == 'success' }} + + - name: Analyze project source + run: dartanalyzer . + if: ${{ always() && steps.install.outcome == 'success' }} + + - name: Run tests (DDC) + run: | + pub run build_runner test -- -P concurrent-tests + pub run build_runner test -- -P non-concurrent-tests + timeout-minutes: 10 + if: ${{ always() && steps.install.outcome == 'success' }} + + - name: Run tests (dart2js) + run: | + pub run build_runner test -r -- -P concurrent-tests + pub run build_runner test -r -- -P non-concurrent-tests + timeout-minutes: 10 if: ${{ always() && steps.install.outcome == 'success' }} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index f831f7a3..ac4a7c23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th homepage: https://github.com/Workiva/react_testing_library/ documentation: https://workiva.github.io/react_testing_library environment: - sdk: ">=2.18.4 <3.0.0" + sdk: ">=2.11.0 <3.0.0" dependencies: color: ">=2.1.1 <4.0.0" From b42872653dba744c36ba51ccd553a88c86048e0d Mon Sep 17 00:00:00 2001 From: Hunter Breathat Date: Tue, 4 Apr 2023 13:04:31 -0400 Subject: [PATCH 15/15] Fix indentation --- .github/workflows/dart_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index 9284da7a..260af3a0 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -46,7 +46,7 @@ jobs: dart run build_runner test -r -- -P concurrent-tests dart run build_runner test -r -- -P non-concurrent-tests timeout-minutes: 10 - if: ${{ always() && steps.install.outcome == 'success' }} + if: ${{ always() && steps.install.outcome == 'success' }} build_legacy: runs-on: ubuntu-latest