diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c820f2450..ff76b159e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Publish uses: k-paxian/dart-package-publisher@master with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ffcd54f7..39512373d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,8 +93,10 @@ jobs: chmod +x ./scripts/prepare_pinning_certs.sh ./scripts/prepare_pinning_certs.sh shell: bash - - run: cd "dio" && dart pub get - - run: cd "dio" && dart test --chain-stack-traces --platform=${{ matrix.platform }} + - run: dart pub get + working-directory: dio + - run: dart test --chain-stack-traces --platform=${{ matrix.platform }} + working-directory: dio test_plugins: needs: [analyze, analyze_flutter] @@ -114,8 +116,10 @@ jobs: chmod +x ./scripts/prepare_pinning_certs.sh ./scripts/prepare_pinning_certs.sh shell: bash - - run: cd ${{ matrix.directory }} && dart pub get - - run: cd ${{ matrix.directory }} && dart test --chain-stack-traces + - run: dart pub get + working-directory: ${{ matrix.directory }} + - run: dart test --chain-stack-traces + working-directory: ${{ matrix.directory }} test_flutter_plugins: needs: [analyze, analyze_flutter] diff --git a/plugins/cookie_manager/pubspec.yaml b/plugins/cookie_manager/pubspec.yaml index 8e0f7728f..42443a2ce 100644 --- a/plugins/cookie_manager/pubspec.yaml +++ b/plugins/cookie_manager/pubspec.yaml @@ -15,7 +15,3 @@ dependencies: dev_dependencies: lints: any test: ^1.16.4 - -#dependency_overrides: -# diox: -# path: ../../dio diff --git a/plugins/cookie_manager/pubspec_overrides.yaml b/plugins/cookie_manager/pubspec_overrides.yaml new file mode 100644 index 000000000..e9aae0c0a --- /dev/null +++ b/plugins/cookie_manager/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + diox: + path: ../../dio diff --git a/plugins/http2_adapter/pubspec.yaml b/plugins/http2_adapter/pubspec.yaml index 93d619184..40003e347 100644 --- a/plugins/http2_adapter/pubspec.yaml +++ b/plugins/http2_adapter/pubspec.yaml @@ -16,7 +16,3 @@ dev_dependencies: crypto: ^3.0.2 lints: any test: ^1.16.4 - -#dependency_overrides: -# diox: -# path: ../../dio diff --git a/plugins/http2_adapter/pubspec_overrides.yaml b/plugins/http2_adapter/pubspec_overrides.yaml new file mode 100644 index 000000000..e9aae0c0a --- /dev/null +++ b/plugins/http2_adapter/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + diox: + path: ../../dio diff --git a/plugins/native_diox_adapter/pubspec_overrides.yaml b/plugins/native_diox_adapter/pubspec_overrides.yaml new file mode 100644 index 000000000..e9aae0c0a --- /dev/null +++ b/plugins/native_diox_adapter/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + diox: + path: ../../dio