Skip to content

Commit

Permalink
Merge pull request backstage#13273 from backstage/rugvip/yarn3
Browse files Browse the repository at this point in the history
Switch to using Yarn 3
  • Loading branch information
Rugvip authored Aug 31, 2022
2 parents 1f402fc + a58bafd commit 6a5bbad
Show file tree
Hide file tree
Showing 156 changed files with 63,997 additions and 190,680 deletions.
5 changes: 5 additions & 0 deletions .changeset/neat-kangaroos-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@backstage/cli': patch
---

Tweaked workspace packaging to not rewrite existing `package.json` files.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.git
.yarn/cache
.yarn/install-state.gz
docs
cypress
microsite
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,6 @@ jobs:
run: git diff --quiet origin/master HEAD -- yarn.lock
continue-on-error: true

- name: lock
run: yarn lock:check

- name: lint
run: yarn backstage-cli repo lint --since origin/master

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
${{ runner.os }}-yarn-
- name: yarn install
if: steps.cache-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: yarn install --immutable
# End of yarn setup

- name: create-app
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_microsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
# dependencies and the microsite. We leave it to the main master workflow to produce the
# cache, as that results in a smaller bundle.
- name: top-level yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: microsite yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable
working-directory: microsite
- name: storybook yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable
working-directory: storybook

- name: build API reference
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync_version-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN }}
- name: Install Dependencies
run: yarn --frozen-lockfile
run: yarn --immutable
- name: Create Release Pull Request
uses: backstage/changesets-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_e2e-techdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/setup-python@v3

- name: install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: generate types
run: yarn tsc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_e2e-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: setup chrome
uses: browser-actions/setup-chrome@latest
- name: yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable

- run: yarn tsc
- run: yarn backstage-cli repo build
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/verify_microsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,13 @@ jobs:
# Skip caching of microsite dependencies, it keeps the global cache size
# smaller, which make Windows builds a lot faster for the rest of the project.
- name: yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable
working-directory: microsite

- name: prettier
run: yarn prettier:check
working-directory: microsite

- name: lock
run: yarn lock:check
working-directory: microsite

- name: build microsite
run: yarn build
working-directory: microsite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
- name: storybook yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable
working-directory: storybook

- run: yarn build-storybook
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

# Windows file operation slowness means there's no point caching this
- name: yarn install
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: lint
run: yarn backstage-cli repo lint
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ typings/
# Optional npm cache directory
.npm

# Yarn 3 files
.pnp.*
**/.yarn/*
!**/.yarn/patches
!**/.yarn/plugins
!**/.yarn/releases
!**/.yarn/sdks
!**/.yarn/versions

# Node version directives
.nvmrc

Expand Down
2 changes: 1 addition & 1 deletion .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- echo "yarn --cwd ${TUGBOAT_ROOT} start-backend --config ${TUGBOAT_ROOT}/app-config.yaml --config ${TUGBOAT_ROOT}/.tugboat/tugboat.app-config.production.yaml" >> /etc/service/node/run
- chmod +x /etc/service/node/run
build:
- yarn install --frozen-lockfile
- yarn install --immutable
- yarn workspace example-app build
start:
# wget the endpoint. Will retry every 2 seconds. 30 retries = 1m for service to come up. Plenty.
Expand Down
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

Loading

0 comments on commit 6a5bbad

Please sign in to comment.