From b18fa68c070beae3d107f616078e65212ae051b3 Mon Sep 17 00:00:00 2001 From: Anthony Miyaguchi Date: Sun, 3 Aug 2025 08:12:11 +0000 Subject: [PATCH 1/4] Add preview on PR --- .github/workflows/hugo.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml index f6b0adb..8c24c42 100644 --- a/.github/workflows/hugo.yaml +++ b/.github/workflows/hugo.yaml @@ -7,6 +7,12 @@ on: branches: - main + # Trigger the workflow on a `pull_request` event, but only when it targets the `main` branch. + # This is for building and deploying previews. + pull_request: + branches: + - main + # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -19,8 +25,8 @@ permissions: # 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 + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true # Default to bash defaults: @@ -65,8 +71,7 @@ jobs: path: | ${{ runner.temp }}/hugo_cache key: hugo-${{ github.run_id }} - restore-keys: - hugo- + restore-keys: hugo- - name: Configure Git run: git config core.quotepath false - name: Build with Hugo @@ -98,4 +103,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file + uses: actions/deploy-pages@v4 From 20dd2ac3550f875a2a8cb7f8787984dfe4313912 Mon Sep 17 00:00:00 2001 From: Anthony Miyaguchi Date: Mon, 4 Aug 2025 04:00:21 +0000 Subject: [PATCH 2/4] Revert "Add preview on PR" This reverts commit b18fa68c070beae3d107f616078e65212ae051b3. --- .github/workflows/hugo.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml index 8c24c42..f6b0adb 100644 --- a/.github/workflows/hugo.yaml +++ b/.github/workflows/hugo.yaml @@ -7,12 +7,6 @@ on: branches: - main - # Trigger the workflow on a `pull_request` event, but only when it targets the `main` branch. - # This is for building and deploying previews. - pull_request: - branches: - - main - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -25,8 +19,8 @@ permissions: # 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: ${{ github.workflow }}-${{ github.event.number || github.ref }} - cancel-in-progress: true + group: "pages" + cancel-in-progress: false # Default to bash defaults: @@ -71,7 +65,8 @@ jobs: path: | ${{ runner.temp }}/hugo_cache key: hugo-${{ github.run_id }} - restore-keys: hugo- + restore-keys: + hugo- - name: Configure Git run: git config core.quotepath false - name: Build with Hugo @@ -103,4 +98,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v4 \ No newline at end of file From 8adf48b00ae81c85e8e5861bbf739cbe76c1965c Mon Sep 17 00:00:00 2001 From: Anthony Miyaguchi Date: Mon, 4 Aug 2025 04:01:13 +0000 Subject: [PATCH 3/4] Add wrangler deploy --- wrangler.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 wrangler.toml diff --git a/wrangler.toml b/wrangler.toml new file mode 100644 index 0000000..c8bfa5f --- /dev/null +++ b/wrangler.toml @@ -0,0 +1,10 @@ +name = "dsgt-arc" +compatibility_date = "2025-06-12" + +[assets] +directory = "./public" + +routes = [ + { pattern = "dsgt-arc.org", custom_domain = true }, + { pattern = "www.dsgt-arc.org", custom_domain = true } +] From 68361f9e0db82b93f2c1805f25f98aaefabc1d37 Mon Sep 17 00:00:00 2001 From: Anthony Miyaguchi Date: Mon, 4 Aug 2025 04:27:56 +0000 Subject: [PATCH 4/4] Remove github workflow --- .github/workflows/hugo.yaml | 101 ------------------------------------ 1 file changed, 101 deletions(-) delete mode 100644 .github/workflows/hugo.yaml diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml deleted file mode 100644 index f6b0adb..0000000 --- a/.github/workflows/hugo.yaml +++ /dev/null @@ -1,101 +0,0 @@ -# Sample workflow for building and deploying a Hugo site to GitHub Pages -name: Deploy Hugo 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 - -# Default to bash -defaults: - run: - # GitHub-hosted runners automatically enable `set -eo pipefail` for Bash shells. - shell: bash - -jobs: - # Build job - build: - runs-on: ubuntu-latest - env: - DART_SASS_VERSION: 1.89.2 - HUGO_VERSION: 0.148.0 - HUGO_ENVIRONMENT: production - TZ: America/Los_Angeles - steps: - - name: Install Hugo CLI - run: | - wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb - sudo dpkg -i ${{ runner.temp }}/hugo.deb - - name: Install Dart Sass - run: | - wget -O ${{ runner.temp }}/dart-sass.tar.gz https://github.com/sass/dart-sass/releases/download/${DART_SASS_VERSION}/dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz - tar -xf ${{ runner.temp }}/dart-sass.tar.gz --directory ${{ runner.temp }} - mv ${{ runner.temp }}/dart-sass/ /usr/local/bin - echo "/usr/local/bin/dart-sass" >> $GITHUB_PATH - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 - - name: Setup Pages - id: pages - uses: actions/configure-pages@v5 - - name: Install Node.js dependencies - run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true" - - name: Cache Restore - id: cache-restore - uses: actions/cache/restore@v4 - with: - path: | - ${{ runner.temp }}/hugo_cache - key: hugo-${{ github.run_id }} - restore-keys: - hugo- - - name: Configure Git - run: git config core.quotepath false - - name: Build with Hugo - run: | - hugo \ - --gc \ - --minify \ - --baseURL "${{ steps.pages.outputs.base_url }}/" \ - --cacheDir "${{ runner.temp }}/hugo_cache" - - name: Cache Save - id: cache-save - uses: actions/cache/save@v4 - with: - path: | - ${{ runner.temp }}/hugo_cache - key: ${{ steps.cache-restore.outputs.cache-primary-key }} - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: ./public - - # 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 \ No newline at end of file