From 628650891a135b46cc9dba568e3cd1554566d07a Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Thu, 28 Sep 2023 15:59:39 +0200 Subject: [PATCH] update github workflow for bitdev --- .github/workflows/main.yml | 130 ++++++++++++++++++------------------- scripts/keep-env.js | 6 +- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e87df8be..a2df1712 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,34 +36,34 @@ jobs: run: bit install --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib --log + run: bit add integration/demo-lib --log - name: Add example app - run: bit add examples/demo-app --log + run: bit add integration/demo-app --log - name: Cleanup node modules run: bit cc @@ -122,37 +122,37 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v16 --log + run: bit add integration/demo-lib-v16 --log - name: Cleanup node modules run: bit cc @@ -208,37 +208,37 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v15 --log + run: bit add integration/demo-lib-v15 --log - name: Cleanup node modules run: bit cc @@ -293,37 +293,37 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v14 --log + run: bit add integration/demo-lib-v14 --log - name: Cleanup node modules run: bit cc @@ -378,37 +378,37 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v13 --log + run: bit add integration/demo-lib-v13 --log - name: Cleanup node modules run: bit cc @@ -464,37 +464,37 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v12 --log + run: bit add integration/demo-lib-v12 --log - name: Cleanup node modules run: bit cc diff --git a/scripts/keep-env.js b/scripts/keep-env.js index 03b6c3cc..b14d37c9 100644 --- a/scripts/keep-env.js +++ b/scripts/keep-env.js @@ -19,13 +19,13 @@ const argv = key => { const regexp = []; // Remove all versions but this one const version = parseInt(argv('version')); -regexp.push(new RegExp(`\\s\\s"teambit\\.angular\\/versions\\/angular\\-v(?!${version})\\d\\d?":\\s\\{\\},\\n`, "g")); +regexp.push(new RegExp(`\\s\\s"bitdev\\.angular\\/envs\\/angular-v(?!${version})\\d\\d?-env":\\s\\{\\},\\n`, "g")); const defaultEnv = argv('default'); // Remove default env & app if needed if(!defaultEnv) { - regexp.push(new RegExp(`\\s\\s"teambit\\.angular\\/angular":\\s\\{\\},\\n`, "g")); - regexp.push(new RegExp(`\\s\\s"examples\\/demo-app":\\s\\{\\},\\n`, "g")); + regexp.push(new RegExp(`\\s\\s"bitdev\\.angular\\/angular-env":\\s\\{\\},\\n`, "g")); + regexp.push(new RegExp(`\\s\\s"integration\\/demo-app":\\s\\{\\},\\n`, "g")); } try {