Merge pull request #8 from kimitrii/kimitri

Refactor GitHub Actions to Run Tests Using cloudflare/wrangler-action@v3 and Remove wrangler.toml

.github/workflows/deploy-cloudflare.yml

@@ -5,28 +5,9 @@ on:
     branches:
       - main
 jobs:
-  test:
-    name: Run tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: git fetch --prune --unshallow --tags
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 9
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Run all tests
-        run: pnpm run test
-
   deploy:
     name: Deploy to Cloudflare Workers
     runs-on: ubuntu-latest
-    needs: ["test"]
     steps:
       - uses: actions/checkout@v4
 
@@ -35,9 +16,11 @@ jobs:
         with:
           version: 9
 
-      - name: Run Migrations and Deploy
+      - name: Run Tests, Migrations and Deploy using Cloudflare CLI environment
         uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          preCommands: pnpm migration:prod
+          preCommands: |
+            pnpm test 
+            pnpm migration:prod
       

.github/workflows/pr-tests.yml

@@ -6,19 +6,19 @@ on:
       - main
 jobs:
   test:
-    name: Run tests
+    name: Run Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: git fetch --prune --unshallow --tags
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 9
 
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Run all tests
-        run: pnpm run test
+      - name: Run tests using Cloudflare CLI environment
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          preCommands: pnpm test
+          command: logout

.gitignore

@@ -29,4 +29,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 # misc
-.DS_Store
+.DS_Store
+
+# cloudflare
+wrangler.toml

vitest.config.ts

@@ -1,23 +1,28 @@
-import { defineWorkersConfig, readD1Migrations } from "@cloudflare/vitest-pool-workers/config";
+import {
+	defineWorkersConfig,
+	readD1Migrations
+} from '@cloudflare/vitest-pool-workers/config'
 
 export default defineWorkersConfig(async () => {
-  const migrations = await readD1Migrations("./src/migrations")
-  return {
-    test: {
-      globals: true,
-      poolOptions: {
-        workers: {
-          isolatedStorage: true,
-          miniflare: {
-            bindings: {
-              TEST_MIGRATIONS: migrations
-            }
-          },
-          wrangler: {
-            configPath: "./wrangler.toml"
-          }
-        }
-      }
-    }
-  }
+	const migrations = await readD1Migrations('./src/migrations')
+	return {
+		test: {
+			globals: true,
+			poolOptions: {
+				workers: {
+					isolatedStorage: true,
+					miniflare: {
+						d1Databases: {
+							DB: 'db-tests'
+						},
+						bindings: {
+							TEST_MIGRATIONS: migrations
+						},
+						compatibilityDate: '2024-11-20',
+						compatibilityFlags: ['nodejs_compat']
+					}
+				}
+			}
+		}
+	}
 })

wrangler.toml.example

@@ -0,0 +1,13 @@
+# Example Cloudflare Workers configuration
+# This file is a template. Replace the placeholders with your actual configuration.
+
+name = "<your-project-name>" # Replace with your project name
+main = "src/index.ts"
+compatibility_date = "2024-11-20"
+compatibility_flags = [ "nodejs_compat" ]
+
+[[d1_databases]]
+binding = "DB"
+database_name = "<your-database-name>" # Replace with the name of your D1 database
+database_id = "<your-database-id>" # Replace with your actual D1 database ID
+migrations_dir = "./src/migrations"