From 7bba4876af9ab46f5144f2e2e7c46ae5538a95e3 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Tue, 31 May 2022 08:33:03 -0700 Subject: [PATCH 1/3] Update .dockerignore --- .dockerignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index df90bf6964..09d3015bea 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,7 +3,6 @@ .travis .vscode .config -.yarn Dockerfile build/ built/ @@ -14,3 +13,10 @@ node_modules/ redis/ files/ misskey-assets/ +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions From e0c57cf1da072dc12dcee0d000f25e9936f422ad Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Tue, 31 May 2022 08:37:15 -0700 Subject: [PATCH 2/3] Update lint.yml --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 66c10bf858..1c452350b1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,7 +21,7 @@ jobs: - run: corepack enable - run: yarn set version berry - run: yarn workspaces foreach install --immutable - - run: yarn workspaces foreach run lint - env: + env: YARN_CHECKSUM_BEHAVIOR: update + - run: yarn workspaces foreach run lint From 789d0f8201e85c5b9471d7baeb5bed49c6a6219b Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Tue, 31 May 2022 08:38:27 -0700 Subject: [PATCH 3/3] Update test.yml --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c7443b046..7383928259 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,8 @@ jobs: - run: corepack enable - run: yarn set version berry - run: yarn workspaces foreach install --immutable + env: + YARN_CHECKSUM_BEHAVIOR: update - name: Check yarn.lock run: git diff --exit-code yarn.lock - name: Copy Configure @@ -47,8 +49,6 @@ jobs: run: yarn build - name: Test run: yarn mocha - env: - YARN_CHECKSUM_BEHAVIOR: update e2e: runs-on: ubuntu-latest @@ -89,6 +89,8 @@ jobs: - run: corepack enable - run: yarn set version berry - run: yarn workspaces foreach install --immutable + env: + YARN_CHECKSUM_BEHAVIOR: update - name: Copy Configure run: cp .github/misskey/test.yml .config - name: Build @@ -114,5 +116,3 @@ jobs: with: name: ${{ matrix.browser }}-cypress-videos path: cypress/videos - env: - YARN_CHECKSUM_BEHAVIOR: update