diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bc100203f..f361a06425 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,12 +276,19 @@ jobs: yarn ./rundist.bash - run: - name: start tests offline + name: run tests command: | cd "apps/remixdesktop/" yarn -v sleep 15 ./run_ci_test.sh + - run: + name: "Run isogit tests" + command: | + cd apps/remixdesktop/ + yarn -v + sleep 15 + ./run_git_ui_isogit_tests.sh - store_test_results: path: ./apps/remixdesktop/reports/tests - store_artifacts: @@ -528,6 +535,12 @@ jobs: nvm use 20 cd apps/remixdesktop ./run_ci_test.sh + - run: + name: "Run isogit tests" + command: | + nvm use 20 + cd apps/remixdesktop + ./run_git_ui_isogit_tests.sh - store_test_results: path: ./apps/remixdesktop/reports/tests - store_artifacts: diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts index f0707e52cb..fb9d0158e9 100644 --- a/apps/remixdesktop/test/tests/app/git-ui.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts @@ -194,7 +194,13 @@ const tests = { }, } const useIsoGit = process.argv.includes('--useIsoGit'); -module.exports = { - ...process.platform.startsWith('win') ? {} : process.platform.startsWith('linux') || useIsoGit ? tests : {} +if (process.platform.startsWith('win')) { + if (useIsoGit) + module.exports = { ...tests } + else + module.exports = {} } +else + module.exports = { ...tests } + diff --git a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts index 9c03b83852..89d3c8ea7a 100644 --- a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts @@ -173,6 +173,11 @@ const tests = { } const useIsoGit = process.argv.includes('--useIsoGit'); -module.exports = { - ...process.platform.startsWith('win') ? {} : process.platform.startsWith('linux') || useIsoGit ? tests : {} -} \ No newline at end of file +if (process.platform.startsWith('win')) { + if (useIsoGit) + module.exports = { ...tests } + else + module.exports = {} +} +else + module.exports = { ...tests } \ No newline at end of file diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts index 6deb7bce7e..f45dc85d0d 100644 --- a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts @@ -144,6 +144,11 @@ const tests = { } const useIsoGit = process.argv.includes('--useIsoGit'); -module.exports = { - ...process.platform.startsWith('win') ? {} : process.platform.startsWith('linux') || useIsoGit ? tests : {} +if (process.platform.startsWith('win')) { + if (useIsoGit) + module.exports = { ...tests } + else + module.exports = {} } +else + module.exports = { ...tests } \ No newline at end of file diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts index 95194e7b33..784ce57edb 100644 --- a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts +++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts @@ -191,6 +191,11 @@ const tests = { } const useIsoGit = process.argv.includes('--useIsoGit'); -module.exports = { - ...process.platform.startsWith('win') ? {} : process.platform.startsWith('linux') || useIsoGit ? tests : {} -} \ No newline at end of file +if (process.platform.startsWith('win')) { + if (useIsoGit) + module.exports = { ...tests } + else + module.exports = {} +} +else + module.exports = { ...tests } \ No newline at end of file