From b957e67dcc3f3ef1eeb7e4d18b8d61624851fd6c Mon Sep 17 00:00:00 2001 From: semanticdata Date: Thu, 7 Mar 2024 13:49:10 -0600 Subject: [PATCH] clean and start new workflow test --- .github/workflows/deploy-npm.yml | 12 ++++-- .github/workflows/deploy-pnpm.yml | 27 ++++++++++--- .github/workflows/deploy-test-only.yml | 52 -------------------------- 3 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 .github/workflows/deploy-test-only.yml diff --git a/.github/workflows/deploy-npm.yml b/.github/workflows/deploy-npm.yml index c5bc0df73..45bd6f7b5 100644 --- a/.github/workflows/deploy-npm.yml +++ b/.github/workflows/deploy-npm.yml @@ -15,20 +15,26 @@ concurrency: group: "pages" cancel-in-progress: false +defaults: + run: + shell: bash + jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all history for git info - - uses: actions/setup-node@v4 + - name: Setup Node + uses: actions/setup-node@v4 with: node-version: 18 - name: Install Dependencies run: npm i - name: Build Quartz - run: npx quartz build + run: npm run build - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: diff --git a/.github/workflows/deploy-pnpm.yml b/.github/workflows/deploy-pnpm.yml index 191b2dbc3..3aad07b3d 100644 --- a/.github/workflows/deploy-pnpm.yml +++ b/.github/workflows/deploy-pnpm.yml @@ -15,6 +15,10 @@ concurrency: group: "pages" cancel-in-progress: false +defaults: + run: + shell: bash + jobs: build: runs-on: ubuntu-latest @@ -23,14 +27,25 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all history for git info - - name: Setup Node - uses: actions/setup-node@v4 + - name: Setup PNPM + uses: pnpm/action-setup@v3 with: - node-version: 18 - - name: Install Dependencies - run: npm i + version: 8 + - name: Get pnpm store directory + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + - name: Setup pnpm cache + uses: actions/cache@v4 + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + - name: Install dependencies + run: pnpm install - name: Build Quartz Site - run: npx quartz build + run: pnpm run build - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: diff --git a/.github/workflows/deploy-test-only.yml b/.github/workflows/deploy-test-only.yml deleted file mode 100644 index c24140b95..000000000 --- a/.github/workflows/deploy-test-only.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Quartz - Deploy to GitHub Pages (test only) - -on: - workflow_dispatch: - # push: - # branches: - # - main - -permissions: - contents: read - pages: write - id-token: write - -concurrency: - group: "pages" - cancel-in-progress: false - -defaults: - run: - shell: bash - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Fetch all history for git info - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: 18 - - name: Install Dependencies - run: npm i - - name: Build Quartz Site - run: npm run build - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: public - - deploy: - needs: build - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - name: Deploy to GitHub Pages - uses: actions/deploy-pages@v4 - id: deployment