diff --git a/.github/workflow/deploy.yml b/.github/workflow/deploy.yml deleted file mode 100644 index 64391e8..0000000 --- a/.github/workflow/deploy.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Deploy Remix site to Pages - -on: - # Runs on pushes targeting the default branch - push: - branches: ["main"] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. -concurrency: - group: "pages" - cancel-in-progress: false - -env: - BUILD_PATH: "." # default value when not using subfolders - # BUILD_PATH: subfolder - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2 - with: - version: "8" - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: "20" - cache: pnpm - - name: Setup Pages - id: pages - uses: actions/configure-pages@v4 - - name: Install dependencies - run: pnpm install - working-directory: ${{ env.BUILD_PATH }} - - name: Build with Remix - run: | - pnpm run build - working-directory: ${{ env.BUILD_PATH }} - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: ${{ env.BUILD_PATH }}/build/client - - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - needs: build - runs-on: ubuntu-latest - name: Deploy - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7fbcdff..64391e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,40 +31,23 @@ 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 - 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 - exit 0 - else - echo "Unable to determine package manager" - exit 1 - fi + - uses: pnpm/action-setup@v2 + with: + version: "8" - name: Setup Node uses: actions/setup-node@v4 with: node-version: "20" - cache: ${{ steps.detect-package-manager.outputs.manager }} - cache-dependency-path: ${{ env.BUILD_PATH }}/package-lock.json + cache: pnpm - name: Setup Pages id: pages uses: actions/configure-pages@v4 - name: Install dependencies - run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} + run: pnpm install working-directory: ${{ env.BUILD_PATH }} - name: Build with Remix run: | - ${{ steps.detect-package-manager.outputs.runner }} run build \ - --site "${{ steps.pages.outputs.origin }}" \ - --base "${{ steps.pages.outputs.base_path }}" + pnpm run build working-directory: ${{ env.BUILD_PATH }} - name: Upload artifact uses: actions/upload-pages-artifact@v3