diff --git a/.github/workflows/astro.yml b/.github/workflows/astro.yml index c82964ee9fcc81e4b273780918038f1e8ab09fb7..4f4604c92bc057f1baf164dbde8508c523a6eb8c 100644 --- a/.github/workflows/astro.yml +++ b/.github/workflows/astro.yml @@ -35,31 +35,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Detect package manager - id: detect-package-manager - run: | - if [ -f "${{ github.workspace }}/yarn.lock" ]; then - echo "manager=yarn" >> $GITHUB_OUTPUT - echo "command=install" >> $GITHUB_OUTPUT - echo "runner=yarn" >> $GITHUB_OUTPUT - echo "lockfile=yarn.lock" >> $GITHUB_OUTPUT - exit 0 - elif [ -f "${{ github.workspace }}/pnpm-lock.yaml" ]; then - echo "manager=pnpm" >> $GITHUB_OUTPUT - echo "command=install" >> $GITHUB_OUTPUT - echo "runner=pnpm" >> $GITHUB_OUTPUT - echo "lockfile=pnpm-lock.yaml" >> $GITHUB_OUTPUT - exit 0 - elif [ -f "${{ github.workspace }}/package.json" ]; then - echo "manager=npm" >> $GITHUB_OUTPUT - echo "command=ci" >> $GITHUB_OUTPUT - echo "runner=npx --no-install" >> $GITHUB_OUTPUT - echo "lockfile=package-lock.json" >> $GITHUB_OUTPUT - exit 0 - else - echo "Unable to determine package manager" - exit 1 - fi - name: Setup Node uses: actions/setup-node@v4 with: @@ -70,11 +45,14 @@ jobs: id: pages uses: actions/configure-pages@v5 - name: Install dependencies - run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} - working-directory: ${{ env.BUILD_PATH }} + uses: pnpm/action-setup@v4 + with: + version: 8 + run_install: | + - recursive: true - name: Build with Astro run: | - ${{ steps.detect-package-manager.outputs.runner }} astro build \ + pnpm astro build \ --site "${{ steps.pages.outputs.origin }}" \ --base "${{ steps.pages.outputs.base_path }}" working-directory: ${{ env.BUILD_PATH }}