From 40cc10cd87521765580bca6d936f543da37ffac6 Mon Sep 17 00:00:00 2001 From: alina sireneva Date: Mon, 22 Apr 2024 00:05:08 +0300 Subject: [PATCH] chore: moved e2e to e2e/node --- .github/workflows/test.yaml | 4 ++-- e2e/{ => node}/.dockerignore | 0 e2e/{ => node}/.env.example | 0 e2e/{ => node}/.gitignore | 0 e2e/{ => node}/.mocharc.json | 0 e2e/{ => node}/.verdaccio/config.yaml | 0 e2e/{ => node}/.verdaccio/htpasswd | 0 e2e/{ => node}/Dockerfile.build | 2 +- e2e/{ => node}/Dockerfile.test | 0 e2e/{ => node}/README.md | 0 e2e/{ => node}/cjs/package.json | 0 e2e/{ => node}/cjs/tests/base-client.js | 0 e2e/{ => node}/cjs/tests/tl-runtime.js | 0 e2e/{ => node}/cjs/tests/tl-schema.js | 0 e2e/{ => node}/cjs/tests/wasm.js | 0 e2e/{ => node}/cjs/utils.js | 0 e2e/{ => node}/cli.sh | 0 e2e/{ => node}/config.js | 0 e2e/{ => node}/docker-compose.yaml | 4 ++-- e2e/{ => node}/docker-entrypoint.sh | 0 e2e/{ => node}/esm/package.json | 0 e2e/{ => node}/esm/tests/base-client.js | 0 e2e/{ => node}/esm/tests/tl-runtime.js | 0 e2e/{ => node}/esm/tests/tl-schema.js | 0 e2e/{ => node}/esm/tests/wasm.js | 0 e2e/{ => node}/esm/utils.js | 0 e2e/{ => node}/package.json | 0 e2e/{ => node}/pnpm-workspace.yaml | 0 e2e/{ => node}/publish-canary.js | 4 +++- e2e/{ => node}/runner.js | 0 e2e/{ => node}/ts/build-esm.cjs | 0 e2e/{ => node}/ts/mocha.esm.json | 0 e2e/{ => node}/ts/package.json | 0 e2e/{ => node}/ts/run-esm.cjs | 0 e2e/{ => node}/ts/tests/01.auth.ts | 0 e2e/{ => node}/ts/tests/02.methods.ts | 0 e2e/{ => node}/ts/tests/03.files.ts | 0 e2e/{ => node}/ts/tests/04.updates.ts | 0 e2e/{ => node}/ts/tests/05.worker.ts | 0 e2e/{ => node}/ts/tests/_worker.ts | 0 e2e/{ => node}/ts/tests/packaging/base-client.ts | 0 e2e/{ => node}/ts/tests/packaging/tl-runtime.ts | 0 e2e/{ => node}/ts/tests/packaging/tl-schema.ts | 0 e2e/{ => node}/ts/tests/packaging/wasm.ts | 0 e2e/{ => node}/ts/tsconfig.json | 0 e2e/{ => node}/ts/utils.ts | 0 scripts/publish.js | 2 +- 47 files changed, 9 insertions(+), 7 deletions(-) rename e2e/{ => node}/.dockerignore (100%) rename e2e/{ => node}/.env.example (100%) rename e2e/{ => node}/.gitignore (100%) rename e2e/{ => node}/.mocharc.json (100%) rename e2e/{ => node}/.verdaccio/config.yaml (100%) rename e2e/{ => node}/.verdaccio/htpasswd (100%) rename e2e/{ => node}/Dockerfile.build (96%) rename e2e/{ => node}/Dockerfile.test (100%) rename e2e/{ => node}/README.md (100%) rename e2e/{ => node}/cjs/package.json (100%) rename e2e/{ => node}/cjs/tests/base-client.js (100%) rename e2e/{ => node}/cjs/tests/tl-runtime.js (100%) rename e2e/{ => node}/cjs/tests/tl-schema.js (100%) rename e2e/{ => node}/cjs/tests/wasm.js (100%) rename e2e/{ => node}/cjs/utils.js (100%) rename e2e/{ => node}/cli.sh (100%) rename e2e/{ => node}/config.js (100%) rename e2e/{ => node}/docker-compose.yaml (90%) rename e2e/{ => node}/docker-entrypoint.sh (100%) rename e2e/{ => node}/esm/package.json (100%) rename e2e/{ => node}/esm/tests/base-client.js (100%) rename e2e/{ => node}/esm/tests/tl-runtime.js (100%) rename e2e/{ => node}/esm/tests/tl-schema.js (100%) rename e2e/{ => node}/esm/tests/wasm.js (100%) rename e2e/{ => node}/esm/utils.js (100%) rename e2e/{ => node}/package.json (100%) rename e2e/{ => node}/pnpm-workspace.yaml (100%) rename e2e/{ => node}/publish-canary.js (94%) rename e2e/{ => node}/runner.js (100%) rename e2e/{ => node}/ts/build-esm.cjs (100%) rename e2e/{ => node}/ts/mocha.esm.json (100%) rename e2e/{ => node}/ts/package.json (100%) rename e2e/{ => node}/ts/run-esm.cjs (100%) rename e2e/{ => node}/ts/tests/01.auth.ts (100%) rename e2e/{ => node}/ts/tests/02.methods.ts (100%) rename e2e/{ => node}/ts/tests/03.files.ts (100%) rename e2e/{ => node}/ts/tests/04.updates.ts (100%) rename e2e/{ => node}/ts/tests/05.worker.ts (100%) rename e2e/{ => node}/ts/tests/_worker.ts (100%) rename e2e/{ => node}/ts/tests/packaging/base-client.ts (100%) rename e2e/{ => node}/ts/tests/packaging/tl-runtime.ts (100%) rename e2e/{ => node}/ts/tests/packaging/tl-schema.ts (100%) rename e2e/{ => node}/ts/tests/packaging/wasm.ts (100%) rename e2e/{ => node}/ts/tsconfig.json (100%) rename e2e/{ => node}/ts/utils.ts (100%) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 95b2299c..f4a4d4f9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -90,7 +90,7 @@ jobs: API_ID: ${{ secrets.TELEGRAM_API_ID }} API_HASH: ${{ secrets.TELEGRAM_API_HASH }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: cd e2e && ./cli.sh ci + run: cd e2e/node && ./cli.sh ci - name: Publish to canary NPM if: github.repository == 'mtcute/mtcute' # do not run on forks continue-on-error: true @@ -98,4 +98,4 @@ jobs: NPM_TOKEN: ${{ secrets.CANARY_NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REGISTRY: 'https://npm.tei.su' - run: cd e2e && ./cli.sh ci-publish + run: cd e2e/node && ./cli.sh ci-publish diff --git a/e2e/.dockerignore b/e2e/node/.dockerignore similarity index 100% rename from e2e/.dockerignore rename to e2e/node/.dockerignore diff --git a/e2e/.env.example b/e2e/node/.env.example similarity index 100% rename from e2e/.env.example rename to e2e/node/.env.example diff --git a/e2e/.gitignore b/e2e/node/.gitignore similarity index 100% rename from e2e/.gitignore rename to e2e/node/.gitignore diff --git a/e2e/.mocharc.json b/e2e/node/.mocharc.json similarity index 100% rename from e2e/.mocharc.json rename to e2e/node/.mocharc.json diff --git a/e2e/.verdaccio/config.yaml b/e2e/node/.verdaccio/config.yaml similarity index 100% rename from e2e/.verdaccio/config.yaml rename to e2e/node/.verdaccio/config.yaml diff --git a/e2e/.verdaccio/htpasswd b/e2e/node/.verdaccio/htpasswd similarity index 100% rename from e2e/.verdaccio/htpasswd rename to e2e/node/.verdaccio/htpasswd diff --git a/e2e/Dockerfile.build b/e2e/node/Dockerfile.build similarity index 96% rename from e2e/Dockerfile.build rename to e2e/node/Dockerfile.build index 7d5721a0..e87c951b 100644 --- a/e2e/Dockerfile.build +++ b/e2e/node/Dockerfile.build @@ -5,7 +5,7 @@ RUN apk add python3 make g++ && \ corepack enable && \ corepack prepare pnpm@8.7.1 --activate -COPY ../ /app/ +COPY ../.. /app/ RUN pnpm install --frozen-lockfile && \ pnpm -C packages/tl run gen-code && \ diff --git a/e2e/Dockerfile.test b/e2e/node/Dockerfile.test similarity index 100% rename from e2e/Dockerfile.test rename to e2e/node/Dockerfile.test diff --git a/e2e/README.md b/e2e/node/README.md similarity index 100% rename from e2e/README.md rename to e2e/node/README.md diff --git a/e2e/cjs/package.json b/e2e/node/cjs/package.json similarity index 100% rename from e2e/cjs/package.json rename to e2e/node/cjs/package.json diff --git a/e2e/cjs/tests/base-client.js b/e2e/node/cjs/tests/base-client.js similarity index 100% rename from e2e/cjs/tests/base-client.js rename to e2e/node/cjs/tests/base-client.js diff --git a/e2e/cjs/tests/tl-runtime.js b/e2e/node/cjs/tests/tl-runtime.js similarity index 100% rename from e2e/cjs/tests/tl-runtime.js rename to e2e/node/cjs/tests/tl-runtime.js diff --git a/e2e/cjs/tests/tl-schema.js b/e2e/node/cjs/tests/tl-schema.js similarity index 100% rename from e2e/cjs/tests/tl-schema.js rename to e2e/node/cjs/tests/tl-schema.js diff --git a/e2e/cjs/tests/wasm.js b/e2e/node/cjs/tests/wasm.js similarity index 100% rename from e2e/cjs/tests/wasm.js rename to e2e/node/cjs/tests/wasm.js diff --git a/e2e/cjs/utils.js b/e2e/node/cjs/utils.js similarity index 100% rename from e2e/cjs/utils.js rename to e2e/node/cjs/utils.js diff --git a/e2e/cli.sh b/e2e/node/cli.sh similarity index 100% rename from e2e/cli.sh rename to e2e/node/cli.sh diff --git a/e2e/config.js b/e2e/node/config.js similarity index 100% rename from e2e/config.js rename to e2e/node/config.js diff --git a/e2e/docker-compose.yaml b/e2e/node/docker-compose.yaml similarity index 90% rename from e2e/docker-compose.yaml rename to e2e/node/docker-compose.yaml index be7dae52..07eaea85 100644 --- a/e2e/docker-compose.yaml +++ b/e2e/node/docker-compose.yaml @@ -12,8 +12,8 @@ services: - mtcute-e2e build: build: - context: .. - dockerfile: e2e/Dockerfile.build + context: ../.. + dockerfile: e2e/node/Dockerfile.build environment: - GITHUB_TOKEN=${GITHUB_TOKEN} networks: diff --git a/e2e/docker-entrypoint.sh b/e2e/node/docker-entrypoint.sh similarity index 100% rename from e2e/docker-entrypoint.sh rename to e2e/node/docker-entrypoint.sh diff --git a/e2e/esm/package.json b/e2e/node/esm/package.json similarity index 100% rename from e2e/esm/package.json rename to e2e/node/esm/package.json diff --git a/e2e/esm/tests/base-client.js b/e2e/node/esm/tests/base-client.js similarity index 100% rename from e2e/esm/tests/base-client.js rename to e2e/node/esm/tests/base-client.js diff --git a/e2e/esm/tests/tl-runtime.js b/e2e/node/esm/tests/tl-runtime.js similarity index 100% rename from e2e/esm/tests/tl-runtime.js rename to e2e/node/esm/tests/tl-runtime.js diff --git a/e2e/esm/tests/tl-schema.js b/e2e/node/esm/tests/tl-schema.js similarity index 100% rename from e2e/esm/tests/tl-schema.js rename to e2e/node/esm/tests/tl-schema.js diff --git a/e2e/esm/tests/wasm.js b/e2e/node/esm/tests/wasm.js similarity index 100% rename from e2e/esm/tests/wasm.js rename to e2e/node/esm/tests/wasm.js diff --git a/e2e/esm/utils.js b/e2e/node/esm/utils.js similarity index 100% rename from e2e/esm/utils.js rename to e2e/node/esm/utils.js diff --git a/e2e/package.json b/e2e/node/package.json similarity index 100% rename from e2e/package.json rename to e2e/node/package.json diff --git a/e2e/pnpm-workspace.yaml b/e2e/node/pnpm-workspace.yaml similarity index 100% rename from e2e/pnpm-workspace.yaml rename to e2e/node/pnpm-workspace.yaml diff --git a/e2e/publish-canary.js b/e2e/node/publish-canary.js similarity index 94% rename from e2e/publish-canary.js rename to e2e/node/publish-canary.js index f0e20ffc..59ca7257 100644 --- a/e2e/publish-canary.js +++ b/e2e/node/publish-canary.js @@ -18,7 +18,9 @@ execSync(`npm config set //${REGISTRY.replace(/^https?:\/\//, '')}/:_authToken $ const commit = CURRENT_COMMIT.slice(0, 7) const myPkgJson = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8')) -const packages = Object.keys(myPkgJson.dependencies).filter((x) => x.startsWith('@mtcute/')).map((x) => x.slice('@mtcute/'.length)) +const packages = Object.keys(myPkgJson.dependencies) + .filter((x) => x.startsWith('@mtcute/')) + .map((x) => x.slice('@mtcute/'.length)) const workDir = path.join(__dirname, 'temp') fs.mkdirSync(workDir, { recursive: true }) diff --git a/e2e/runner.js b/e2e/node/runner.js similarity index 100% rename from e2e/runner.js rename to e2e/node/runner.js diff --git a/e2e/ts/build-esm.cjs b/e2e/node/ts/build-esm.cjs similarity index 100% rename from e2e/ts/build-esm.cjs rename to e2e/node/ts/build-esm.cjs diff --git a/e2e/ts/mocha.esm.json b/e2e/node/ts/mocha.esm.json similarity index 100% rename from e2e/ts/mocha.esm.json rename to e2e/node/ts/mocha.esm.json diff --git a/e2e/ts/package.json b/e2e/node/ts/package.json similarity index 100% rename from e2e/ts/package.json rename to e2e/node/ts/package.json diff --git a/e2e/ts/run-esm.cjs b/e2e/node/ts/run-esm.cjs similarity index 100% rename from e2e/ts/run-esm.cjs rename to e2e/node/ts/run-esm.cjs diff --git a/e2e/ts/tests/01.auth.ts b/e2e/node/ts/tests/01.auth.ts similarity index 100% rename from e2e/ts/tests/01.auth.ts rename to e2e/node/ts/tests/01.auth.ts diff --git a/e2e/ts/tests/02.methods.ts b/e2e/node/ts/tests/02.methods.ts similarity index 100% rename from e2e/ts/tests/02.methods.ts rename to e2e/node/ts/tests/02.methods.ts diff --git a/e2e/ts/tests/03.files.ts b/e2e/node/ts/tests/03.files.ts similarity index 100% rename from e2e/ts/tests/03.files.ts rename to e2e/node/ts/tests/03.files.ts diff --git a/e2e/ts/tests/04.updates.ts b/e2e/node/ts/tests/04.updates.ts similarity index 100% rename from e2e/ts/tests/04.updates.ts rename to e2e/node/ts/tests/04.updates.ts diff --git a/e2e/ts/tests/05.worker.ts b/e2e/node/ts/tests/05.worker.ts similarity index 100% rename from e2e/ts/tests/05.worker.ts rename to e2e/node/ts/tests/05.worker.ts diff --git a/e2e/ts/tests/_worker.ts b/e2e/node/ts/tests/_worker.ts similarity index 100% rename from e2e/ts/tests/_worker.ts rename to e2e/node/ts/tests/_worker.ts diff --git a/e2e/ts/tests/packaging/base-client.ts b/e2e/node/ts/tests/packaging/base-client.ts similarity index 100% rename from e2e/ts/tests/packaging/base-client.ts rename to e2e/node/ts/tests/packaging/base-client.ts diff --git a/e2e/ts/tests/packaging/tl-runtime.ts b/e2e/node/ts/tests/packaging/tl-runtime.ts similarity index 100% rename from e2e/ts/tests/packaging/tl-runtime.ts rename to e2e/node/ts/tests/packaging/tl-runtime.ts diff --git a/e2e/ts/tests/packaging/tl-schema.ts b/e2e/node/ts/tests/packaging/tl-schema.ts similarity index 100% rename from e2e/ts/tests/packaging/tl-schema.ts rename to e2e/node/ts/tests/packaging/tl-schema.ts diff --git a/e2e/ts/tests/packaging/wasm.ts b/e2e/node/ts/tests/packaging/wasm.ts similarity index 100% rename from e2e/ts/tests/packaging/wasm.ts rename to e2e/node/ts/tests/packaging/wasm.ts diff --git a/e2e/ts/tsconfig.json b/e2e/node/ts/tsconfig.json similarity index 100% rename from e2e/ts/tsconfig.json rename to e2e/node/ts/tsconfig.json diff --git a/e2e/ts/utils.ts b/e2e/node/ts/utils.ts similarity index 100% rename from e2e/ts/utils.ts rename to e2e/node/ts/utils.ts diff --git a/scripts/publish.js b/scripts/publish.js index dcd7dff8..5736e76a 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -147,7 +147,7 @@ async function main(arg = process.argv[2]) { const pkgVersion = require(`../packages/${pkg}/package.json`).version const published = await checkVersion(pkg, pkgVersion) - if (published) { + if (published && !process.env.E2E) { console.log('[i] %s is up to date', pkg) continue }