From e72bd283dab08481d03cbe199d41ee55ea255c2d Mon Sep 17 00:00:00 2001 From: alishadalal-wk Date: Wed, 3 Apr 2024 13:59:43 +0530 Subject: [PATCH 1/3] FEDX-687 : GHA OSS changes to dependency_validator --- .github/workflows/dart_ci.yaml | 4 ++++ Dockerfile | 1 - skynet.yaml | 13 ------------- 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 Dockerfile delete mode 100644 skynet.yaml diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 7ef20f8..5b194d7 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -31,3 +31,7 @@ jobs: run: dart analyze - name: Run tests run: dart test + - uses: anchore/sbom-action@v0 + with: + path: ./ + format: cyclonedx-json diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c35f1b5..0000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM scratch diff --git a/skynet.yaml b/skynet.yaml deleted file mode 100644 index cf528ce..0000000 --- a/skynet.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: tests -description: Tests -contact: 'Frontend Frameworks Architecture / #support-frontend-architecture' -image: drydock.workiva.net/workiva/skynet-images:bash_curl_alpinelatest-latest -size: small -timeout: short - -run: - on-tag: true - on-pull-request: true - -scripts: - - echo "No tests currently set" From e0acc67f646f9166c6e23c131473bf9572f4d973 Mon Sep 17 00:00:00 2001 From: alishadalal-wk Date: Wed, 3 Apr 2024 20:28:44 +0530 Subject: [PATCH 2/3] FEDX-687 : Remove 2.18 from CI matrix --- .github/workflows/dart_ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 5b194d7..0d3d36a 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - sdk: [ 2.18.7, 2.19.6 ] + sdk: [ 2.19.6 ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v1 From 81e5deb310267670b0c4ffd6ce2e249fa419a929 Mon Sep 17 00:00:00 2001 From: Rob Becker Date: Fri, 5 Apr 2024 11:43:13 -0600 Subject: [PATCH 3/3] fix build_config issue in tests --- test/executable_test.dart | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/test/executable_test.dart b/test/executable_test.dart index 56726f5..3aa9258 100644 --- a/test/executable_test.dart +++ b/test/executable_test.dart @@ -19,6 +19,14 @@ import 'package:io/io.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; +/// `master` on build_config has a min sdk bound of dart 3.0.0. +/// Since dependency_validator is still designed to be used on dart 2 +/// code, we still want to run unit tests using this older version +/// +/// The following ref, is the last commit in build_config that allowed +/// dart 2 as a dependency +const buildConfigRef = 'e2c837b48bd3c4428cb40e2bc1a6cf47d45df8cc'; + ProcessResult checkProject(String projectPath, {List optionalArgs = const []}) { final pubGetResult = @@ -65,7 +73,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); final fakeProjectBuild = unindent(''' @@ -134,7 +142,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('missing', [ @@ -241,7 +249,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('over_promoted', [ @@ -312,7 +320,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('under_promoted', [ @@ -384,7 +392,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('unused', [ @@ -452,7 +460,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('project', [ @@ -496,7 +504,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); final validDotDart = '' @@ -537,7 +545,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('common_binaries', [ @@ -573,7 +581,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('common_binaries', [ @@ -607,7 +615,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); final build = unindent(r''' @@ -650,7 +658,7 @@ void main() { git: url: https://github.com/dart-lang/build.git path: build_config - ref: master + ref: $buildConfigRef '''); await d.dir('dependency_pins', [