From a0ea58fc4fe79b72bc39852c1d369894fb913f9e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 24 Sep 2024 21:25:51 -0300 Subject: [PATCH 1/3] Always run build --- .github/workflows/deploy.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index c6384a5..5eae54c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,11 +1,6 @@ name: Deploy to GitHub Pages -on: - # Trigger the workflow every time you push to the `main` branch - # Using a different branch name? Replace `main` with your branch’s name - push: - branches: [ main ] - # Allows you to run this workflow manually from the Actions tab on GitHub. +on: [push, pull_request] workflow_dispatch: # Allow this job to clone the repo and create a page deployment @@ -19,21 +14,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout your repository using git - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install, build, and upload your site - uses: withastro/action@v1 - # with: - # path: . # The root location of your Astro project inside the repository. (optional) - # node-version: 18 # The specific version of Node that should be used to build your site. Defaults to 18. (optional) - # package-manager: pnpm@latest # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional) + uses: withastro/action@v3 deploy: needs: build runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v4 \ No newline at end of file From 117c03d5d18360d765b2203aa704da1bef645d01 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 24 Sep 2024 21:43:15 -0300 Subject: [PATCH 2/3] Changing assets from dynamic diagram & repl to public folder --- .../dynamicDiagram/images/dark-mode.png | Bin .../dynamicDiagram/images/pin-objects.png | Bin .../dynamicDiagram/styles/dynamicDiagram.css | 0 {src/assets => public}/repl/evaluate.svg | 0 {src/assets => public}/repl/refresh.svg | 0 {src/assets => public}/repl/reload.svg | 0 {src/assets => public}/repl/zoom-in.svg | 0 {src/assets => public}/repl/zoom-out.svg | 0 .../components/landing-page/repl/ReplEvaluator.tsx | 6 +++--- .../landing-page/repl/dynamicDiagram.html | 6 +++--- .../components/landing-page/repl/replEditor.html | 4 ++-- 11 files changed, 8 insertions(+), 8 deletions(-) rename {src/assets => public}/dynamicDiagram/images/dark-mode.png (100%) rename {src/assets => public}/dynamicDiagram/images/pin-objects.png (100%) rename {src/assets => public}/dynamicDiagram/styles/dynamicDiagram.css (100%) rename {src/assets => public}/repl/evaluate.svg (100%) rename {src/assets => public}/repl/refresh.svg (100%) rename {src/assets => public}/repl/reload.svg (100%) rename {src/assets => public}/repl/zoom-in.svg (100%) rename {src/assets => public}/repl/zoom-out.svg (100%) diff --git a/src/assets/dynamicDiagram/images/dark-mode.png b/public/dynamicDiagram/images/dark-mode.png similarity index 100% rename from src/assets/dynamicDiagram/images/dark-mode.png rename to public/dynamicDiagram/images/dark-mode.png diff --git a/src/assets/dynamicDiagram/images/pin-objects.png b/public/dynamicDiagram/images/pin-objects.png similarity index 100% rename from src/assets/dynamicDiagram/images/pin-objects.png rename to public/dynamicDiagram/images/pin-objects.png diff --git a/src/assets/dynamicDiagram/styles/dynamicDiagram.css b/public/dynamicDiagram/styles/dynamicDiagram.css similarity index 100% rename from src/assets/dynamicDiagram/styles/dynamicDiagram.css rename to public/dynamicDiagram/styles/dynamicDiagram.css diff --git a/src/assets/repl/evaluate.svg b/public/repl/evaluate.svg similarity index 100% rename from src/assets/repl/evaluate.svg rename to public/repl/evaluate.svg diff --git a/src/assets/repl/refresh.svg b/public/repl/refresh.svg similarity index 100% rename from src/assets/repl/refresh.svg rename to public/repl/refresh.svg diff --git a/src/assets/repl/reload.svg b/public/repl/reload.svg similarity index 100% rename from src/assets/repl/reload.svg rename to public/repl/reload.svg diff --git a/src/assets/repl/zoom-in.svg b/public/repl/zoom-in.svg similarity index 100% rename from src/assets/repl/zoom-in.svg rename to public/repl/zoom-in.svg diff --git a/src/assets/repl/zoom-out.svg b/public/repl/zoom-out.svg similarity index 100% rename from src/assets/repl/zoom-out.svg rename to public/repl/zoom-out.svg diff --git a/src/content/components/landing-page/repl/ReplEvaluator.tsx b/src/content/components/landing-page/repl/ReplEvaluator.tsx index 56ca695..0e0c546 100644 --- a/src/content/components/landing-page/repl/ReplEvaluator.tsx +++ b/src/content/components/landing-page/repl/ReplEvaluator.tsx @@ -130,13 +130,13 @@ export const ReplEvaluator = () => {
diff --git a/src/content/components/landing-page/repl/dynamicDiagram.html b/src/content/components/landing-page/repl/dynamicDiagram.html index e766021..6ee02d8 100644 --- a/src/content/components/landing-page/repl/dynamicDiagram.html +++ b/src/content/components/landing-page/repl/dynamicDiagram.html @@ -8,7 +8,7 @@ - +