From bdbc448d1347b962c703eea8de3fe5fe66625492 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Wed, 23 Nov 2022 22:39:00 -0800 Subject: refactor: migrate to Yarn Berry (v3.2.1) (#8764) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Yarn berry * Add `.yarn` to dockerignore * Mention in CHANGELOG * Update Dockerfile * Proper upgrade to yarn * use `"packageManager"` * Replace `install-packages.js` with workspaces * Replace `install-packages.js` with workspaces * Typo * `corepack enable` for linting * Remove `packages/*/yarn.lock` * Improve lint workflow * Update .github/workflows/lint.yml Co-authored-by: Acid Chicken (硫酸鶏) * Update .github/workflows/lint.yml Co-authored-by: Acid Chicken (硫酸鶏) * Add `eslint` * Regenerate yarn.lock * 🙏‍ * Update lint.yml :thinking: * Fix workflow! * yarn lint my beloved * corepack enable for mocha/e2e * Update CHANGELOG.md * fix the code that depends on node_modules * tbh * tbh * More yarn workspaces stuff * 🍀 * Change `browser-image-resizer` * :finnadie: * :goberserk: * :godmode: * Remove yarnrc for workspaces * 🙏 * Add proper packages for eslint * Skip extra install * New steps for test.yml too * uhh * Update .dockerignore * Update lint.yml * Update test.yml * Make client/backend lints seperate workflows * package.json names * pnpm = dont change paths * Fix changelog * :bowtie: * I don't know why github workflows hates me... * test * ????? * continue-on-error: true * Fix yarn.lock Co-authored-by: ishowta * add @rollup/pluginutils * add packageExtensions for chartjs_date-fns Co-authored-by: acid-chicken * npm run => yarn * wip * yarn node => node 依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない * fix * fix http-signature * fix * fix * add packageExtensions * :v: * remove `yarn set version berry` * yarn install --immutable Co-authored-by: ishowta * https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892 * enable actions/setup-node's global cache * Update .gitignore Co-authored-by: iwata * revival gulp build https://github.com/misskey-dev/misskey/pull/8764/files/66ab7591bff9b35255219057e33399a06260aa31#r885899944 * fix lockfile * Update packages/backend/package.json Co-authored-by: iwata * remove packagemanager * `yarn run gulp` in `build` instead of just `gulp` * Update CHANGELOG.md * update lockfile * Add .yarn/cache to gitignore for packages * ? * move resolutions * :v: * update lockfie * update-lockfile * update yarn.lock * fix build * fix * fix * fix: add @tensorflow/tfjs * ダメ * modify lockfile * use yarnrc * update yarnlock * add jest-mock * update-lockfile * update lockfile * update lockfile * move jest-mock, update lockfile Co-authored-by: Acid Chicken (硫酸鶏) Co-authored-by: tamaina Co-authored-by: ishowta --- .github/workflows/lint.yml | 32 +++++++++++--------------------- .github/workflows/test.yml | 25 ++++++++++--------------- 2 files changed, 21 insertions(+), 36 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4e42fa9314..5e93c04aa3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,32 +8,22 @@ on: pull_request: jobs: - backend: + lint: + strategy: + matrix: + workspace: + - backend + - client runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: true - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v3.2.0 with: node-version: 18.x cache: 'yarn' - cache-dependency-path: | - packages/backend/yarn.lock - - run: yarn install - - run: yarn --cwd ./packages/backend lint - - client: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions/setup-node@v3 - with: - node-version: 18.x - cache: 'yarn' - cache-dependency-path: | - packages/client/yarn.lock - - run: yarn install - - run: yarn --cwd ./packages/client lint + - run: corepack enable + - run: yarn install --immutable + - run: yarn workspace ${{ matrix.workspace }} run lint diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 326c5a5537..444ee0b5c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,7 @@ jobs: env: POSTGRES_DB: test-misskey POSTGRES_HOST_AUTH_METHOD: trust + YARN_CHECKSUM_BEHAVIOR: update redis: image: redis:6 ports: @@ -33,15 +34,12 @@ jobs: with: submodules: true - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v3.2.0 with: node-version: ${{ matrix.node-version }} cache: 'yarn' - cache-dependency-path: | - packages/backend/yarn.lock - packages/client/yarn.lock - - name: Install dependencies - run: yarn install + - run: corepack enable + - run: yarn install --immutable - name: Check yarn.lock run: git diff --exit-code yarn.lock - name: Copy Configure @@ -89,17 +87,14 @@ jobs: #- uses: browser-actions/setup-firefox@latest # if: ${{ matrix.browser == 'firefox' }} - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v3.2.0 with: node-version: ${{ matrix.node-version }} cache: 'yarn' - cache-dependency-path: | - packages/backend/yarn.lock - packages/client/yarn.lock - - name: Install dependencies - run: yarn install - - name: Check yarn.lock - run: git diff --exit-code yarn.lock + - run: corepack enable + - run: yarn install --immutable + env: + YARN_CHECKSUM_BEHAVIOR: update - name: Copy Configure run: cp .github/misskey/test.yml .config - name: Build @@ -111,7 +106,7 @@ jobs: uses: cypress-io/github-action@v4 with: install: false - start: npm run start:test + start: yarn start:test wait-on: 'http://localhost:61812' headless: false browser: ${{ matrix.browser }} -- cgit v1.2.3-freya