diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml index a728a7c..fe27edc 100644 --- a/files/.github/workflows/ci.yml +++ b/files/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: steps: - uses: actions/checkout@v4<% if (pnpm) { %> - - uses: pnpm/action-setup@v4<% } %> + - uses: pnpm/action-setup@v4 + with: + version: 10<% } %> - uses: actions/setup-node@v4 with: node-version: 22 @@ -38,7 +40,9 @@ jobs: steps: - uses: actions/checkout@v4<% if (pnpm) { %> - - uses: pnpm/action-setup@v4<% } %> + - uses: pnpm/action-setup@v4 + with: + version: 10<% } %> - uses: actions/setup-node@v4 with: node-version: 22 @@ -49,9 +53,7 @@ jobs: run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test # For the Try Scenarios - id: set-matrix - run: | - <% if (pnpm) { %> echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %> - <% if (npm) { %> echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %> + run: <% if (pnpm) { %>echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %><% if (npm) { %>echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %> floating: name: "Floating Dependencies" @@ -60,7 +62,9 @@ jobs: steps: - uses: actions/checkout@v4<% if (pnpm) { %> - - uses: pnpm/action-setup@v4<% } %> + - uses: pnpm/action-setup@v4 + with: + version: 10<% } %> - uses: actions/setup-node@v4 with: node-version: 22 @@ -81,19 +85,19 @@ jobs: steps: - uses: actions/checkout@v4<% if (pnpm) { %> - - uses: pnpm/action-setup@v4<% } %> + - uses: pnpm/action-setup@v4 + with: + version: 10<% } %> - uses: actions/setup-node@v4 with: node-version: 22 cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> - name: Apply Scenario run: | - <% if (pnpm) { %> pnpm dlx @embroider/try apply ${{ matrix.name }}<% } %> - <% if (npm) { %> npx @embroider/try apply ${{ matrix.name }}<% } %> + <% if (pnpm) { %>pnpm dlx @embroider/try apply ${{ matrix.name }}<% } %> + <% if (npm) { %>npx @embroider/try apply ${{ matrix.name }}<% } %> - name: Install Dependencies run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-package-lock' %> - name: Run Tests - run: | - <% if (pnpm) { %>pnpm test<% } %> - <% if (npm) { %>npm test<% } %> + run: <% if (pnpm) { %>pnpm test<% } %><% if (npm) { %>npm test<% } %> env: ${{ matrix.env }} diff --git a/tests/fixtures/default/.github/workflows/ci.yml b/tests/fixtures/default/.github/workflows/ci.yml index 32879a6..0d95bc2 100644 --- a/tests/fixtures/default/.github/workflows/ci.yml +++ b/tests/fixtures/default/.github/workflows/ci.yml @@ -47,9 +47,7 @@ jobs: run: npm run test # For the Try Scenarios - id: set-matrix - run: | - - echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT + run: echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT floating: name: "Floating Dependencies" @@ -83,13 +81,9 @@ jobs: node-version: 22 cache: npm - name: Apply Scenario - run: | - - npx @embroider/try apply ${{ matrix.name }} + run: npx @embroider/try apply ${{ matrix.name }} - name: Install Dependencies run: npm install --no-package-lock - name: Run Tests - run: | - - npm test + run: npm test env: ${{ matrix.env }} diff --git a/tests/fixtures/pnpm/.github/workflows/ci.yml b/tests/fixtures/pnpm/.github/workflows/ci.yml index 1961de9..70f6b1f 100644 --- a/tests/fixtures/pnpm/.github/workflows/ci.yml +++ b/tests/fixtures/pnpm/.github/workflows/ci.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 + with: + version: 10 - uses: actions/setup-node@v4 with: node-version: 22 @@ -39,6 +41,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 + with: + version: 10 - uses: actions/setup-node@v4 with: node-version: 22 @@ -49,9 +53,7 @@ jobs: run: pnpm test # For the Try Scenarios - id: set-matrix - run: | - echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT - + run: echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT floating: name: "Floating Dependencies" @@ -61,6 +63,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 + with: + version: 10 - uses: actions/setup-node@v4 with: node-version: 22 @@ -82,18 +86,17 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 + with: + version: 10 - uses: actions/setup-node@v4 with: node-version: 22 cache: pnpm - name: Apply Scenario - run: | - pnpm dlx @embroider/try apply ${{ matrix.name }} - + run: pnpm dlx @embroider/try apply ${{ matrix.name }} + - name: Install Dependencies run: pnpm install --no-lockfile - name: Run Tests - run: | - pnpm test - + run: pnpm test env: ${{ matrix.env }} diff --git a/tests/fixtures/yarn/.github/workflows/ci.yml b/tests/fixtures/yarn/.github/workflows/ci.yml index 3b1d325..19f98ca 100644 --- a/tests/fixtures/yarn/.github/workflows/ci.yml +++ b/tests/fixtures/yarn/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: try-scenarios: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest - needs: 'test' + needs: "test" timeout-minutes: 10 strategy: