From f5deb5aed08532d128f30424a2b998f231d5b241 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 11 Feb 2024 14:38:04 +0000 Subject: [PATCH 1/2] update CI action versions --- .github/workflows/ci.yml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef7d9c6..08dd22a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,14 +24,13 @@ jobs: timeout-minutes: 5 steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ matrix.node-version }} + node-version: 18 cache: pnpm - run: pnpm install --frozen-lockfile - run: pnpm lint @@ -49,12 +48,12 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: pnpm @@ -79,12 +78,12 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: pnpm @@ -104,12 +103,12 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: pnpm @@ -130,12 +129,12 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: pnpm @@ -167,11 +166,11 @@ jobs: - ember-release-no-deprecations steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: 7 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 14 cache: pnpm From 00e0cc97e79307f96d4b0894bafddb799c50e32a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 11 Feb 2024 14:39:31 +0000 Subject: [PATCH 2/2] fix pnpm-lockfile --- pnpm-lock.yaml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8fdcffa1..a467e6a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,10 +54,10 @@ importers: specifier: ^5.1.2 version: 5.1.2 fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../fastboot fastboot-express-middleware: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../fastboot-express-middleware fastboot-transform: specifier: ^0.1.3 @@ -328,10 +328,10 @@ importers: specifier: ^4.17.2 version: 4.17.2 fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../fastboot fastboot-express-middleware: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../fastboot-express-middleware devDependencies: chai: @@ -377,7 +377,7 @@ importers: specifier: ^4.1.2 version: 4.1.2 fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../fastboot devDependencies: chai: @@ -527,7 +527,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot ember-cli-head: specifier: ^1.0.0 @@ -647,7 +647,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot ember-cli-htmlbars: specifier: ^5.1.2 @@ -755,7 +755,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot ember-cli-htmlbars: specifier: ^5.1.2 @@ -842,7 +842,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot ember-cli-fastboot-testing: specifier: ^0.5.0 @@ -1049,7 +1049,7 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot ember-cli-htmlbars: specifier: ^5.1.2 @@ -1115,15 +1115,17 @@ importers: specifier: ^3.28.0 version: 3.28.0 ember-cli-fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/ember-cli-fastboot fastboot: - specifier: 4.1.1 + specifier: 4.1.2 version: link:../../packages/fastboot mocha: specifier: ^9.1.2 version: 9.1.2 + test-packages/test-scenarios/output/dist: {} + packages: /@ampproject/remapping@2.2.1: