diff --git a/.github/workflows/build-and-deploy-test.yml b/.github/workflows/build-and-deploy-test.yml index 2a77e4b3..853930aa 100644 --- a/.github/workflows/build-and-deploy-test.yml +++ b/.github/workflows/build-and-deploy-test.yml @@ -105,17 +105,17 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TEST_LINK_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_TEST_LINK_ACCOUNT_ID }} + CLOUDFLARE_PROJECT_NAME: ${{ vars.CLOUDFLARE_PROJECT_NAME }} HEAD_BRANCH: ${{ github.head_ref }} run: | echo "Installing Wrangler CLI" npm i -g wrangler echo "Deploying build to Cloudflare Pages" - directory='public' - projectName=${{ secrets.CLOUDFLARE_PROJECT_NAME }} + directory='dist' branch=$(echo "$HEAD_BRANCH" | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/') - cf_preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?) + cf_preview_url=$(wrangler pages deploy $directory --project-name=$CLOUDFLARE_PROJECT_NAME --branch=$branch > log.txt 2>&1; echo $?) echo "------" - preview_url=https://$branch.$projectName.pages.dev + preview_url=https://$branch.$CLOUDFLARE_PROJECT_NAME.pages.dev cat log.txt if grep -q "Deployment complete" log.txt; then echo "preview_url=$preview_url" >> "$GITHUB_OUTPUT"