From 4bebab2b7af7ec9121cb2be4ccbbd3ff4fd502c3 Mon Sep 17 00:00:00 2001 From: Vincent Scavinner Date: Tue, 23 May 2023 15:09:49 +0200 Subject: [PATCH] chore(ci): use pnpm instead of yarn --- .github/workflows/lint.yml | 18 ++++++---- .github/workflows/release.yml | 26 ++++++++------ .github/workflows/test.yml | 65 ++++++++++++++++++++-------------- ember-phone-input/package.json | 3 -- package.json | 4 --- test-app/package.json | 3 -- 6 files changed, 67 insertions(+), 52 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c74b4c616..384567dff 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ on: branches: - master tags: - - '*' + - "*" pull_request: jobs: @@ -19,9 +19,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Volta - uses: volta-cli/action@v4 - - name: Install Dependencies - run: yarn install --frozen-lockfile + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 16.x + - name: Install pnpm + uses: NullVoxPopuli/action-setup-pnpm@v1 + with: + pnpm-version: 8.5.1 + - name: Install dependencies + run: pnpm install --frozen-lockfile - name: Run Lint - run: yarn lint + run: pnpm lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53ee2a1b9..4be24010d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: tags: - - 'v*' + - "v*" jobs: release: @@ -11,19 +11,25 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 with: node-version: 16 - registry-url: 'https://registry.npmjs.org' - - - run: yarn install - - run: yarn build - + registry-url: "https://registry.npmjs.org" + - name: Install pnpm + uses: NullVoxPopuli/action-setup-pnpm@v1 + with: + pnpm-version: 8.5.1 + - name: Install dependencies + run: pnpm install + - name: Build addon + run: pnpm build - name: auto-dist-tag run: npx auto-dist-tag@1 --write - - - run: npm publish + - name: Publish + run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} working-directory: ember-phone-input diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3c599489..51ecf3144 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: branches: - master tags: - - '*' + - "*" pull_request: jobs: @@ -20,14 +20,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Volta - uses: volta-cli/action@v4 + - name: Install Node + uses: actions/setup-node@v3 with: - node-version: 16 - - name: Install Dependencies - run: yarn install --frozen-lockfile + node-version: 16.x + - name: Install pnpm + uses: NullVoxPopuli/action-setup-pnpm@v1 + with: + pnpm-version: 8.5.1 + - name: Install dependencies + run: pnpm install --frozen-lockfile - name: Test - run: yarn test:ember + run: pnpm test:ember working-directory: test-app try-scenarios: @@ -43,28 +47,32 @@ jobs: ember-try-scenario: - ember-lts-3.28 - ember-lts-4.4 - - 'ember-release' - - 'ember-beta' - - 'ember-canary' - - 'embroider-safe' - - 'embroider-optimized' - - 'ember-classic' + - "ember-release" + - "ember-beta" + - "ember-canary" + - "embroider-safe" + - "embroider-optimized" + - "ember-classic" steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Volta - uses: volta-cli/action@v4 + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 16.x + - name: Install pnpm + uses: NullVoxPopuli/action-setup-pnpm@v1 with: - node-version: 16 - - name: Install Dependencies - run: yarn install --frozen-lockfile + pnpm-version: 8.5.1 + - name: Install dependencies + run: pnpm install --frozen-lockfile - name: Test - run: yarn ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup + run: pnpm ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup working-directory: test-app floating-dependencies: - name: Floating Dependencies + name: Floating dependencies runs-on: ubuntu-latest timeout-minutes: 10 @@ -73,12 +81,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Volta - uses: volta-cli/action@v4 + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 16.x + - name: Install pnpm + uses: NullVoxPopuli/action-setup-pnpm@v1 with: - node-version: 16 - - name: Install Dependencies - run: yarn install --no-lockfile + pnpm-version: 8.5.1 + no-lockfile: true + - name: Install dependencies + run: pnpm install --no-lockfile - name: Test - run: yarn test:ember + run: pnpm test:ember working-directory: test-app diff --git a/ember-phone-input/package.json b/ember-phone-input/package.json index f222d14bf..01924f313 100644 --- a/ember-phone-input/package.json +++ b/ember-phone-input/package.json @@ -84,8 +84,5 @@ ".": "./dist/index.js", "./*": "./dist/*.js", "./addon-main.js": "./addon-main.cjs" - }, - "volta": { - "extends": "../package.json" } } diff --git a/package.json b/package.json index 32b9ccbd5..a85a58d5c 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,6 @@ "engines": { "node": "16.* || >= 18" }, - "volta": { - "node": "18.16.0", - "yarn": "1.22.19" - }, "publishConfig": { "registry": "https://registry.npmjs.org" }, diff --git a/test-app/package.json b/test-app/package.json index a84d889c4..cb3eaf990 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -90,8 +90,5 @@ }, "dependencies": { "ember-phone-input": "*" - }, - "volta": { - "extends": "../package.json" } }