From caab43506afad59c19afae72d4bca68d2a9d98e6 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Thu, 19 Jan 2023 22:34:55 +0000 Subject: [PATCH 1/7] Test Dart 2.18 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 180eae2..04d6bea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM drydock-prod.workiva.net/workiva/dart2_base_image:1 +FROM drydock-prod.workiva.net/workiva/dart2_base_image:0.0.0-dart2.18.7 WORKDIR /build ADD pubspec.* /build/ From b5fa603b03c3ad9611ff972634748093b85ac891 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Wed, 25 Jan 2023 13:35:34 -0700 Subject: [PATCH 2/7] run dart format --- .github/workflows/dart_ci.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index c168899..de263f7 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -42,18 +42,6 @@ jobs: run: dart run dart_dev test --release if: always() && steps.install.outcome == 'success' - format: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v0.2 - with: - sdk: 2.13.4 - - - id: install - name: Install dependencies - run: dart pub get - - name: Verify formatting - run: dart run dart_dev format --check + run: dart format --set-exit-if-changed . if: always() && steps.install.outcome == 'success' \ No newline at end of file From 95a2b61392b07153b98e6bb303aa7534da9c4950 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Wed, 25 Jan 2023 13:41:03 -0700 Subject: [PATCH 3/7] remove dev channel, use dart analyze --- .github/workflows/dart_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index de263f7..09032bb 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.13.4, stable, beta, dev ] + sdk: [ 2.13.4, stable, beta ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v0.2 @@ -31,7 +31,7 @@ jobs: if: always() && steps.install.outcome == 'success' - name: Analyze project source - run: dart run dart_dev analyze + run: dart analyze if: always() && steps.install.outcome == 'success' - name: Run tests with ddc From a6ef8a81d1e27cabea4ca69fbb2d74cbf0f963b0 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Wed, 25 Jan 2023 16:57:01 -0700 Subject: [PATCH 4/7] matrix 2.18.7 directly --- .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 09032bb..ab3efe7 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.13.4, stable, beta ] + sdk: [ 2.13.4, 2.18.7 ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v0.2 From 9582122c75247f739f9a8e1b22a9871d3844f629 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Mon, 30 Jan 2023 13:04:37 -0700 Subject: [PATCH 5/7] avoid test 1.18 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 5e5663d..26b4ead 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,4 +21,4 @@ dev_dependencies: dart_style: ^2.1.1 dependency_validator: ^3.0.0 over_react: ">=3.12.0 <5.0.0" - test: ^1.15.7 + test: ">=1.15.7 <1.18.0" From 3ec501f7e7d04f112207bd290cd30417181976a2 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Mon, 30 Jan 2023 14:30:56 -0700 Subject: [PATCH 6/7] avoid bad test version 1.81.1 --- dart_dependency_validator.yaml | 3 +++ pubspec.yaml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 dart_dependency_validator.yaml diff --git a/dart_dependency_validator.yaml b/dart_dependency_validator.yaml new file mode 100644 index 0000000..88ca34a --- /dev/null +++ b/dart_dependency_validator.yaml @@ -0,0 +1,3 @@ +ignore: + # Ignore the pin on the test package while we have to avoid a bad version of test 1.18.1 https://github.com/dart-lang/test/issues/1620 + - test \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 26b4ead..70b32d6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,4 +21,5 @@ dev_dependencies: dart_style: ^2.1.1 dependency_validator: ^3.0.0 over_react: ">=3.12.0 <5.0.0" - test: ">=1.15.7 <1.18.0" + # Avoid a bad version of test 1.18.1 https://github.com/dart-lang/test/issues/1620 + test: ">=1.15.7 <1.18.1" From 315e364719eda2de40636770adc08989be925159 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Mon, 30 Jan 2023 14:41:12 -0700 Subject: [PATCH 7/7] undo 2.18 docker image override --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 04d6bea..180eae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM drydock-prod.workiva.net/workiva/dart2_base_image:0.0.0-dart2.18.7 +FROM drydock-prod.workiva.net/workiva/dart2_base_image:1 WORKDIR /build ADD pubspec.* /build/