diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 75e88d60b585..e0a808a4ed1b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -763,7 +763,7 @@ jobs: platform: - lambda - netlify-cli - - netlify-ci + - netlify-github - gcp-functions - firebase-functions - azure-functions-linux diff --git a/platforms-serverless/netlify-cli/README.md b/platforms-serverless/netlify-cli/README.md index b1db224971cb..3477167aa585 100644 --- a/platforms-serverless/netlify-cli/README.md +++ b/platforms-serverless/netlify-cli/README.md @@ -1,4 +1,4 @@ -# Netlify CLI +# Netlify via CLI Prisma and Netlify (deploy via netlify CLI) integration. diff --git a/platforms-serverless/netlify-cli/package.json b/platforms-serverless/netlify-cli/package.json index 0b8336159822..59f255b64064 100644 --- a/platforms-serverless/netlify-cli/package.json +++ b/platforms-serverless/netlify-cli/package.json @@ -1,5 +1,5 @@ { - "name": "netlify", + "name": "netlify-cli", "version": "1.0.0", "main": "index.js", "license": "MIT", diff --git a/platforms-serverless/netlify-cli/prisma/schema.prisma b/platforms-serverless/netlify-cli/prisma/schema.prisma index 312308a84cbc..d005c9446775 100644 --- a/platforms-serverless/netlify-cli/prisma/schema.prisma +++ b/platforms-serverless/netlify-cli/prisma/schema.prisma @@ -7,7 +7,7 @@ datasource db { generator client { provider = "prisma-client-js" binaryTargets = ["rhel-openssl-1.0.x"] - output = "../functions/generated/client" + output = "../functions/generated/client" // Why does this need/use a custom output? } model User { diff --git a/platforms-serverless/netlify-cli/run.sh b/platforms-serverless/netlify-cli/run.sh index b342f5546f3c..2f64af91f67b 100644 --- a/platforms-serverless/netlify-cli/run.sh +++ b/platforms-serverless/netlify-cli/run.sh @@ -22,7 +22,7 @@ mv index.zip ../functions-build/index.zip cd .. # deploy content of `functions-build` to Netlify -yarn netlify deploy --dir=. --prod --functions=functions-build +yarn netlify deploy --dir=. --functions=functions-build # TODO Use individual deployment URL and store # TODO Why is this done? diff --git a/platforms-serverless/netlify-cli/test.sh b/platforms-serverless/netlify-cli/test.sh index 9b82e790b8ef..5d35cd27929a 100644 --- a/platforms-serverless/netlify-cli/test.sh +++ b/platforms-serverless/netlify-cli/test.sh @@ -9,4 +9,4 @@ else fi # TODO Use individual deployment URL -npx ts-node ../../utils/fetch-retry-and-confirm-version.ts --url https://prisma2-e2e-tests-netlify-cli.netlify.app/.netlify/functions/index --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string $BINARY_STRING +npx ts-node ../../utils/fetch-retry-and-confirm-version.ts --url https://prisma-ecosystem-tests-netlify-cli.netlify.app/.netlify/functions/index --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string $BINARY_STRING diff --git a/platforms-serverless/netlify-ci/.gitignore b/platforms-serverless/netlify-github/.gitignore similarity index 100% rename from platforms-serverless/netlify-ci/.gitignore rename to platforms-serverless/netlify-github/.gitignore diff --git a/platforms-serverless/netlify-ci/README.md b/platforms-serverless/netlify-github/README.md similarity index 68% rename from platforms-serverless/netlify-ci/README.md rename to platforms-serverless/netlify-github/README.md index ff4fa0e15071..fe92a648e96a 100644 --- a/platforms-serverless/netlify-ci/README.md +++ b/platforms-serverless/netlify-github/README.md @@ -1,6 +1,6 @@ -# Netlify CI +# Netlify via GitHub -Prisma and Netlify integration via Git (via another separate Git repository that is pushed to during deployment) +Prisma and Netlify integration via GitHub (via another separate Git repository that is pushed to during deployment) ## How to run this locally diff --git a/platforms-serverless/netlify-ci/finally.sh b/platforms-serverless/netlify-github/finally.sh similarity index 100% rename from platforms-serverless/netlify-ci/finally.sh rename to platforms-serverless/netlify-github/finally.sh diff --git a/platforms-serverless/netlify-ci/functions/index.js b/platforms-serverless/netlify-github/functions/index.js similarity index 100% rename from platforms-serverless/netlify-ci/functions/index.js rename to platforms-serverless/netlify-github/functions/index.js diff --git a/platforms-serverless/netlify-ci/index.html b/platforms-serverless/netlify-github/index.html similarity index 100% rename from platforms-serverless/netlify-ci/index.html rename to platforms-serverless/netlify-github/index.html diff --git a/platforms-serverless/netlify-ci/netlify.toml b/platforms-serverless/netlify-github/netlify.toml similarity index 100% rename from platforms-serverless/netlify-ci/netlify.toml rename to platforms-serverless/netlify-github/netlify.toml diff --git a/platforms-serverless/netlify-ci/package.json b/platforms-serverless/netlify-github/package.json similarity index 77% rename from platforms-serverless/netlify-ci/package.json rename to platforms-serverless/netlify-github/package.json index fe4241bdb599..dec351965b2f 100644 --- a/platforms-serverless/netlify-ci/package.json +++ b/platforms-serverless/netlify-github/package.json @@ -1,5 +1,5 @@ { - "name": "netlify-ci-to-be-replace-on-build", + "name": "netlify-github-to-be-replaced-on-build", "version": "1.0.0", "main": "index.js", "license": "MIT", @@ -10,7 +10,7 @@ }, "scripts": { "dev": "npx netlify dev", - "build": "PRISMA_TELEMETRY_INFORMATION='ecosystem-tests platform netlify-ci build' && yarn prisma generate" + "build": "PRISMA_TELEMETRY_INFORMATION='ecosystem-tests platform netlify-github build' && yarn prisma generate" }, "dependencies": { "@prisma/client": "4.12.0-dev.34" diff --git a/platforms-serverless/netlify-ci/prisma/schema-with-binary.prisma b/platforms-serverless/netlify-github/prisma/schema-with-binary.prisma similarity index 100% rename from platforms-serverless/netlify-ci/prisma/schema-with-binary.prisma rename to platforms-serverless/netlify-github/prisma/schema-with-binary.prisma diff --git a/platforms-serverless/netlify-ci/prisma/schema-with-node-api.prisma b/platforms-serverless/netlify-github/prisma/schema-with-node-api.prisma similarity index 100% rename from platforms-serverless/netlify-ci/prisma/schema-with-node-api.prisma rename to platforms-serverless/netlify-github/prisma/schema-with-node-api.prisma diff --git a/platforms-serverless/netlify-ci/prisma/schema.prisma b/platforms-serverless/netlify-github/prisma/schema.prisma similarity index 100% rename from platforms-serverless/netlify-ci/prisma/schema.prisma rename to platforms-serverless/netlify-github/prisma/schema.prisma diff --git a/platforms-serverless/netlify-ci/run.sh b/platforms-serverless/netlify-github/run.sh similarity index 85% rename from platforms-serverless/netlify-ci/run.sh rename to platforms-serverless/netlify-github/run.sh index 4d150617490f..958c01a164e5 100644 --- a/platforms-serverless/netlify-ci/run.sh +++ b/platforms-serverless/netlify-github/run.sh @@ -17,7 +17,8 @@ fi # Modify package.json to bust cache -sed -i "s/netlify-ci-to-be-replace-on-build/$(date +%s%N)/" package.json +# TODO Is this still needed? +sed -i "s/netlify-github-to-be-replaced-on-build/$(date +%s%N)/" package.json # Set up project rm -rf node_modules/ @@ -36,7 +37,7 @@ git config --global user.name "Prismo" # push project to Netlify git init -git remote add origin "git@github.com:prisma/prisma2-e2e-tests-netlify.git" +git remote add origin "git@github.com:prisma/prisma-ecosystem-tests-netlify-github.git" git add . git commit -m "push to netlify: $ID, engine = $PRISMA_CLIENT_ENGINE_TYPE" # TODO Do not force push so history is available diff --git a/platforms-serverless/netlify-ci/test.sh b/platforms-serverless/netlify-github/test.sh similarity index 75% rename from platforms-serverless/netlify-ci/test.sh rename to platforms-serverless/netlify-github/test.sh index 501070474a7e..ae6df650f061 100644 --- a/platforms-serverless/netlify-ci/test.sh +++ b/platforms-serverless/netlify-github/test.sh @@ -10,4 +10,4 @@ else files=',"files":["deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-1.0.x.so.node","package.json","schema.prisma"]' fi -npx ts-node ../../utils/fetch-retry-and-confirm-version.ts --url https://$ID--prisma2-e2e-tests-netlify-ci.netlify.app/.netlify/functions/index --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string $files +npx ts-node ../../utils/fetch-retry-and-confirm-version.ts --url https://$ID--prisma-ecosystem-tests-netlify-github.netlify.app/.netlify/functions/index --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string $files diff --git a/platforms-serverless/netlify-ci/yarn.lock b/platforms-serverless/netlify-github/yarn.lock similarity index 100% rename from platforms-serverless/netlify-ci/yarn.lock rename to platforms-serverless/netlify-github/yarn.lock