diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/deploy.yml similarity index 91% rename from .github/workflows/on-pull-request.yml rename to .github/workflows/deploy.yml index 18e7af15..2745e8df 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/deploy.yml @@ -1,98 +1,100 @@ -name: Build and Deploy to Github Pages -on: - # Runs both on pull requests and when a pull request is merged. - push: - branches: ["main"] - pull_request: - branches: ["*"] - -jobs: - # This job builds the book. You can download the resulting build "artifact" by - # navigating to your actions manager in Github, selecting this run, and clicking - # "download artifact" on the "website" artifact. - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout source - uses: actions/checkout@v4 - - - name: Build student web version with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: build web-student - project-root: "." - output-dir: "." - - - name: Build student print version with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: build print-student - project-root: "." - output-dir: "." - - - name: Build instructor web version with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: build web - project-root: "." - output-dir: "." - - - name: Build instructor print version with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: build print-instructor - project-root: "." - output-dir: "." - - - name: Build slides with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: build slides - project-root: "." - output-dir: "." - - - name: Stage with PreTeXt - uses: siefkenj/pretext-build-action@main - with: - pretext-command: deploy --stage-only - project-root: "." - output-dir: "." - - - name: Bundle output/stage as artifact - uses: actions/upload-artifact@v4 - with: - name: website - path: output/stage - - # This job deploys the artifact built in the previous job to Github pages. - deploy: - runs-on: ubuntu-latest - # only deploy to github pages if we have merged into main or master - if: github.event_name == 'push' && github.ref == 'refs/heads/main' - needs: build - permissions: - contents: read - pages: write - id-token: write - concurrency: - group: "page" - cancel-in-progress: false - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - steps: - - name: Download website artifact - uses: actions/download-artifact@v4 - with: - name: website - path: website - - name: Setup Pages - uses: actions/configure-pages@v4 - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: "./website" - - name: Deploy to Github Pages - id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file +name: Deploy to GitHub pages +on: +# Automatically deploy when a commit is pushed to +# the main (or otherwise configured) branch + push: + branches: ["main"] +# The below allows for manually deploying by running the action +# via GitHub.com + workflow_dispatch: + +jobs: + # This job builds the book. You can download the resulting build "artifact" by + # navigating to your actions manager in Github, selecting this run, and clicking + # "download artifact" on the "website" artifact. + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Build student web version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build web-student + project-root: "." + output-dir: "." + + - name: Build student print version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build print-student + project-root: "." + output-dir: "." + + - name: Build instructor web version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build web + project-root: "." + output-dir: "." + + - name: Build instructor print version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build print-instructor + project-root: "." + output-dir: "." + + - name: Build slides with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build slides + project-root: "." + output-dir: "." + + - name: Stage with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: deploy --stage-only + project-root: "." + output-dir: "." + + - name: Bundle output/stage as artifact + uses: actions/upload-artifact@v4 + with: + name: website + path: output/stage + + # This job deploys the artifact built in the previous job to Github pages. + deploy: + runs-on: ubuntu-latest + # only deploy to github pages if we have merged into main or master + if: github.event_name == 'push' && github.ref == 'refs/heads/main' + needs: build + permissions: + contents: read + pages: write + id-token: write + concurrency: + group: "page" + cancel-in-progress: false + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Download website artifact + uses: actions/download-artifact@v4 + with: + name: website + path: website + - name: Setup Pages + uses: actions/configure-pages@v4 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: "./website" + - name: Deploy to Github Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml new file mode 100644 index 00000000..cb453b52 --- /dev/null +++ b/.github/workflows/test-build.yml @@ -0,0 +1,64 @@ +name: Test Build +on: + # Runs on pull requests + pull_request: + branches: ["*"] + +jobs: + # This job builds the book. You can download the resulting build "artifact" by + # navigating to your actions manager in Github, selecting this run, and clicking + # "download artifact" on the "website" artifact. + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Build student web version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build web-student + project-root: "." + output-dir: "." + + - name: Build student print version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build print-student + project-root: "." + output-dir: "." + + - name: Build instructor web version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build web + project-root: "." + output-dir: "." + + - name: Build instructor print version with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build print-instructor + project-root: "." + output-dir: "." + + - name: Build slides with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: build slides + project-root: "." + output-dir: "." + + - name: Stage with PreTeXt + uses: siefkenj/pretext-build-action@main + with: + pretext-command: deploy --stage-only + project-root: "." + output-dir: "." + + - name: Bundle output/stage as artifact + uses: actions/upload-artifact@v4 + with: + name: website + path: output/stage diff --git a/requirements.txt b/requirements.txt index 0d744dc6..d52e9272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -pretext == 2.3.4 +pretext == 2.4.1 checkit-dashboard == 0.2.6