From cd701945e390b0ec66ca8eca65e240e652f041da Mon Sep 17 00:00:00 2001 From: be5invis Date: Wed, 13 Mar 2024 23:50:11 -0700 Subject: [PATCH] Fix casing and keep the pages deployment pipeline in pages branch only --- .github/workflows/pages-deploy.yml | 67 ----------------------------- tools/misc/src/make-webfont-css.mjs | 2 +- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 .github/workflows/pages-deploy.yml diff --git a/.github/workflows/pages-deploy.yml b/.github/workflows/pages-deploy.yml deleted file mode 100644 index 782f3d343..000000000 --- a/.github/workflows/pages-deploy.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Deploy Pages from ·pages-source` Branch - -on: - # Runs on pushes targeting the default branch - push: - branches: [pages-source] - - # 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 - -jobs: - # Build job - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: 'pages-source' - - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version: lts/* - - - name: Setup Pages - uses: actions/configure-pages@v4 - with: - # Automatically inject basePath in your Next.js configuration file and disable - # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized). - # - # You may remove this line if you want to manage the configuration yourself. - static_site_generator: next - - - name: Build with Next.js - run: | - npm install - npm run build - - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: ./out - - # Deployment job - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/tools/misc/src/make-webfont-css.mjs b/tools/misc/src/make-webfont-css.mjs index 3e4bb5d72..79100e660 100644 --- a/tools/misc/src/make-webfont-css.mjs +++ b/tools/misc/src/make-webfont-css.mjs @@ -21,7 +21,7 @@ export default function (output, family, hs, formats, unhinted) { const src = formats .map( ext => - `url('${ext}${dirSuffix}/${term.name}.${ext}') ` + + `url('${ext}${dirSuffix}/${term.name}.${ext.toLowerCase()}') ` + `format('${WebfontFormatMap.get(ext)}')`, ) .join(", ");