diff --git a/.gitea/workflows/deploy-pages.yaml b/.gitea/workflows/deploy-pages.yaml index 90dbea1..1ec3591 100644 --- a/.gitea/workflows/deploy-pages.yaml +++ b/.gitea/workflows/deploy-pages.yaml @@ -1,4 +1,4 @@ -name: Deploy to Cloudflare Pages (cobalt) +name: Deploy to Cloudflare Pages (cobalt, wrangler-action) on: push: @@ -10,16 +10,15 @@ jobs: runs-on: ubuntu-latest env: CF_PAGES_PROJECT: ${{ vars.CF_PAGES_PROJECT }} # 例: blog - PROD_BRANCH: "main" # Pagesの本番ブランチ + PROD_BRANCH: "main" CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - CI: "1" steps: - name: Checkout uses: https://github.com/actions/checkout@v4 - - name: Install cobalt (prebuilt via eget) + - name: Install cobalt (prebuilt) shell: bash run: | set -euo pipefail @@ -29,21 +28,12 @@ jobs: cobalt --version - name: Build site with cobalt - run: cobalt build # 既定出力: ./_site + run: cobalt build # 出力: ./_site - - name: Compute BRANCH_NAME and COMMIT meta - id: meta - shell: bash - run: | - bn="${GITHUB_REF_NAME:-${GITEA_REF_NAME:-}}" - if [ -z "$bn" ]; then bn="$(git rev-parse --abbrev-ref HEAD)"; fi - echo "BRANCH_NAME=$bn" >> "$GITHUB_ENV" - echo "COMMIT_SHA=$(git rev-parse HEAD)" >> "$GITHUB_ENV" - echo "COMMIT_MSG=$(git log -1 --pretty=%s)" >> "$GITHUB_ENV" - - - name: Deploy with wrangler-action + # --- Wrangler ActionでPagesにデプロイ --- + - name: Deploy to Cloudflare Pages uses: https://github.com/cloudflare/wrangler-action@v3 with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy _site --project-name "${{ vars.CF_PAGES_PROJECT }}" --branch "${{ env.BRANCH_NAME }}" + apiToken: ${{ env.CLOUDFLARE_API_TOKEN }} + accountId: ${{ env.CLOUDFLARE_ACCOUNT_ID }} + command: pages deploy _site --project-name "${{ env.CF_PAGES_PROJECT }}" --branch "${{ github.ref_name || env.GITEA_REF_NAME || 'main' }}"