Merge branch 'master' into dev

rrousselGit · Dec 24, 2024 · d7dc8e3 · d7dc8e3
2 parents d90f2d3 + 17d5e37
commit d7dc8e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
           # - packages/riverpod_graph
           # TODO(rousselGit) blocked by https://github.com/invertase/dart_custom_lint/issues/16
           # - packages/riverpod_lint_flutter_test
-          - website
+          # - website
 
     steps:
       - uses: actions/checkout@v3.1.0
@@ -58,11 +58,8 @@ jobs:
         run: echo "PUB_CACHE="$HOME/.pub-cache"" >> $GITHUB_ENV
       - name: Install dependencies
         run: flutter pub get
-      - name: Install dependencies (integration/buid.yaml)
-        run: |
-          if test -d "integration/build_yaml"; then
-            flutter pub get integration/build_yaml
-          fi
+      - if: matrix.package_path == 'packages/riverpod_generator'
+        run: rm -rf integration
       - name: Install dependencies (website/third-party)
         run: |
           if test -d "third-party"; then

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
diff --git a/website/yarn.lock b/website/yarn.lock
@@ -5448,9 +5448,9 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 negotiator@0.6.3:
   version "0.6.3"