diff --git a/.github/workflows/cloudflare-pages.yml b/.github/workflows/cloudflare-pages.yml index 8d1a5bf..0889650 100644 --- a/.github/workflows/cloudflare-pages.yml +++ b/.github/workflows/cloudflare-pages.yml @@ -6,6 +6,9 @@ on: - main workflow_dispatch: +env: + OAUTH_DIR: oauth_new + jobs: deploy: runs-on: ubuntu-latest @@ -24,21 +27,18 @@ jobs: - name: Install dependencies run: | - cd oauth + cd ${{ env.OAUTH_DIR }} npm install - name: Build OAuth app run: | - cd oauth + cd ${{ env.OAUTH_DIR }} NODE_ENV=production npm run build - name: Copy OAuth build to static run: | - # Remove old assets (following run.zsh pattern) rm -rf my-blog/static/assets - # Copy all dist files to static - cp -rf oauth/dist/* my-blog/static/ - # Copy index.html to oauth-assets.html template - cp oauth/dist/index.html my-blog/templates/oauth-assets.html + cp -rf ${{ env.OAUTH_DIR }}/dist/* my-blog/static/ + cp ${{ env.OAUTH_DIR }}/dist/index.html my-blog/templates/oauth-assets.html - name: Cache ailog binary uses: actions/cache@v4 diff --git a/oauth_new/CLOUDFLARE_DEPLOY.yml b/oauth_new/CLOUDFLARE_DEPLOY.yml new file mode 100644 index 0000000..a22efb2 --- /dev/null +++ b/oauth_new/CLOUDFLARE_DEPLOY.yml @@ -0,0 +1,57 @@ +name: Deploy to Cloudflare Pages + +on: + push: + branches: + - main + workflow_dispatch: + +env: + OAUTH_DIR: oauth_new + +jobs: + deploy: + runs-on: ubuntu-latest + permissions: + contents: read + deployments: write + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'npm' + cache-dependency-path: ${{ env.OAUTH_DIR }}/package-lock.json + + - name: Install dependencies + run: | + cd ${{ env.OAUTH_DIR }} + npm ci + + - name: Build OAuth app + run: | + cd ${{ env.OAUTH_DIR }} + NODE_ENV=production npm run build + env: + VITE_ADMIN: ${{ secrets.VITE_ADMIN }} + VITE_PDS: ${{ secrets.VITE_PDS }} + VITE_HANDLE_LIST: ${{ secrets.VITE_HANDLE_LIST }} + VITE_COLLECTION: ${{ secrets.VITE_COLLECTION }} + VITE_OAUTH_CLIENT_ID: ${{ secrets.VITE_OAUTH_CLIENT_ID }} + VITE_OAUTH_REDIRECT_URI: ${{ secrets.VITE_OAUTH_REDIRECT_URI }} + VITE_ENABLE_TEST_UI: 'false' + VITE_ENABLE_DEBUG: 'false' + + - name: Deploy to Cloudflare Pages + uses: cloudflare/pages-action@v1 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }} + directory: ${{ env.OAUTH_DIR }}/dist + gitHubToken: ${{ secrets.GITHUB_TOKEN }} + deploymentName: Production \ No newline at end of file