From 1f6d4357dac32f1ca81fd7e5931820032985cb6c Mon Sep 17 00:00:00 2001 From: freddyaboulton Date: Fri, 29 Sep 2023 13:42:54 -0400 Subject: [PATCH 1/7] Try bash --- .github/workflows/backend.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 07e6f55b54bb9..f771900078e75 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -89,6 +89,7 @@ jobs: cache: pnpm cache-dependency-path: pnpm-lock.yaml - name: Build frontend + shell: bash if: steps.frontend-cache.outputs.cache-hit != 'true' run: | pnpm i --frozen-lockfile --ignore-scripts @@ -182,6 +183,7 @@ jobs: cache-dependency-path: pnpm-lock.yaml - name: Build frontend if: steps.frontend-cache.outputs.cache-hit != 'true' + shell: bash run: | pnpm i --frozen-lockfile --ignore-scripts pnpm build From d62705a0832869c48fe69280e20107ac42f67f59 Mon Sep 17 00:00:00 2001 From: freddyaboulton Date: Fri, 29 Sep 2023 13:52:17 -0400 Subject: [PATCH 2/7] Use cross-env --- .github/workflows/backend.yml | 2 -- js/app/package.json | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index f771900078e75..07e6f55b54bb9 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -89,7 +89,6 @@ jobs: cache: pnpm cache-dependency-path: pnpm-lock.yaml - name: Build frontend - shell: bash if: steps.frontend-cache.outputs.cache-hit != 'true' run: | pnpm i --frozen-lockfile --ignore-scripts @@ -183,7 +182,6 @@ jobs: cache-dependency-path: pnpm-lock.yaml - name: Build frontend if: steps.frontend-cache.outputs.cache-hit != 'true' - shell: bash run: | pnpm i --frozen-lockfile --ignore-scripts pnpm build diff --git a/js/app/package.json b/js/app/package.json index 3b23b8a733443..3e58f8c633300 100644 --- a/js/app/package.json +++ b/js/app/package.json @@ -11,7 +11,7 @@ "build:cdn": "vite build --mode production:cdn --emptyOutDir", "build:website": "vite build --mode production:website --emptyOutDir", "build:local": "vite build --mode production:local --emptyOutDir", - "build:cc": "NODE_ENV=development vite build --mode dev:custom --emptyOutDir", + "build:cc": "cross-env NODE_ENV=development vite build --mode dev:custom --emptyOutDir", "cssbuild": "python ../../scripts/generate_theme.py --outfile ./src/lite/theme.css", "pybuild:gradio": "cd ../../ && rm -rf gradio/templates/frontend && python -m build", "pybuild:gradio-client": "cd ../../client/python && python -m build", @@ -71,7 +71,8 @@ "d3-dsv": "^3.0.1", "mime-types": "^2.1.34", "postcss": "^8.4.21", - "postcss-prefix-selector": "^1.16.0" + "postcss-prefix-selector": "^1.16.0", + "cross-env": "^7.0.3", }, "msw": { "workerDirectory": "public" From b9b5527b56df1b906eb416eb97ae8b773342771c Mon Sep 17 00:00:00 2001 From: freddyaboulton Date: Fri, 29 Sep 2023 14:05:22 -0400 Subject: [PATCH 3/7] Trigger CI --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 07e6f55b54bb9..3562eb7a554ca 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -88,7 +88,7 @@ jobs: node-version: 18 cache: pnpm cache-dependency-path: pnpm-lock.yaml - - name: Build frontend + - name: Build Frontend if: steps.frontend-cache.outputs.cache-hit != 'true' run: | pnpm i --frozen-lockfile --ignore-scripts From 0b90880f7638f871bc5dbb44ec2502b630559317 Mon Sep 17 00:00:00 2001 From: freddyaboulton Date: Fri, 29 Sep 2023 14:08:23 -0400 Subject: [PATCH 4/7] Fix comma --- js/app/package.json | 2 +- pnpm-lock.yaml | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/js/app/package.json b/js/app/package.json index 3e58f8c633300..b20bbae068529 100644 --- a/js/app/package.json +++ b/js/app/package.json @@ -72,7 +72,7 @@ "mime-types": "^2.1.34", "postcss": "^8.4.21", "postcss-prefix-selector": "^1.16.0", - "cross-env": "^7.0.3", + "cross-env": "^7.0.3" }, "msw": { "workerDirectory": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c3115c585ab7..146b4113a3129 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -844,6 +844,48 @@ importers: specifier: workspace:^ version: link:../utils + js/gradio-preview/test/coolslider/frontend: + dependencies: + '@gradio/atoms': + specifier: workspace:^ + version: link:../../../../atoms + '@gradio/statustracker': + specifier: workspace:^ + version: link:../../../../statustracker + '@gradio/utils': + specifier: workspace:^ + version: link:../../../../utils + + js/gradio-preview/test/newtextbox/frontend: + dependencies: + '@gradio/atoms': + specifier: workspace:^ + version: link:../../../../atoms + '@gradio/icons': + specifier: workspace:^ + version: link:../../../../icons + '@gradio/statustracker': + specifier: workspace:^ + version: link:../../../../statustracker + '@gradio/utils': + specifier: workspace:^ + version: link:../../../../utils + + js/gradio-preview/test/segaeditor/frontend: + dependencies: + '@gradio/atoms': + specifier: workspace:^ + version: link:../../../../atoms + '@gradio/statustracker': + specifier: workspace:^ + version: link:../../../../statustracker + '@gradio/utils': + specifier: workspace:^ + version: link:../../../../utils + '@zerodevx/svelte-json-view': + specifier: ^1.0.7 + version: 1.0.7(svelte@4.2.0) + js/group: {} js/highlightedtext: @@ -6525,7 +6567,7 @@ packages: peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.16.3(svelte@3.57.0)(vite@4.3.5) + '@sveltejs/kit': 1.16.3(svelte@3.59.2)(vite@4.3.9) import-meta-resolve: 3.0.0 dev: true From d39a04b1ea80dc04d028aee422146af5b6a9bee7 Mon Sep 17 00:00:00 2001 From: gradio-pr-bot Date: Fri, 29 Sep 2023 18:09:24 +0000 Subject: [PATCH 5/7] add changeset --- .changeset/heavy-animals-think.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/heavy-animals-think.md diff --git a/.changeset/heavy-animals-think.md b/.changeset/heavy-animals-think.md new file mode 100644 index 0000000000000..00c30f1dcca55 --- /dev/null +++ b/.changeset/heavy-animals-think.md @@ -0,0 +1,6 @@ +--- +"@gradio/app": patch +"gradio": patch +--- + +feat:WIP: Fix windows ci build From ba0a525e766458bdabe42abfe613453472250cc2 Mon Sep 17 00:00:00 2001 From: freddyaboulton Date: Fri, 29 Sep 2023 14:12:27 -0400 Subject: [PATCH 6/7] Modify lock file --- pnpm-lock.yaml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 146b4113a3129..6b38f92ca6a4c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -499,6 +499,9 @@ importers: '@gradio/wasm': specifier: workspace:^ version: link:../wasm + cross-env: + specifier: ^7.0.3 + version: 7.0.3 d3-dsv: specifier: ^3.0.1 version: 3.0.1 @@ -6567,7 +6570,7 @@ packages: peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.16.3(svelte@3.59.2)(vite@4.3.9) + '@sveltejs/kit': 1.16.3(svelte@3.57.0)(vite@4.3.5) import-meta-resolve: 3.0.0 dev: true @@ -8676,6 +8679,14 @@ packages: resolution: {integrity: sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==} dev: false + /cross-env@7.0.3: + resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==} + engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'} + hasBin: true + dependencies: + cross-spawn: 7.0.3 + dev: false + /cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} dependencies: @@ -11270,7 +11281,7 @@ packages: dev: true /isexe@2.0.0: - resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} /isobject@3.0.1: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} @@ -12712,7 +12723,7 @@ packages: engines: {node: '>=0.10.0'} /path-key@2.0.1: - resolution: {integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=} + resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==} engines: {node: '>=4'} dev: false @@ -14034,7 +14045,7 @@ packages: dev: true /shebang-command@1.2.0: - resolution: {integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=} + resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} dependencies: shebang-regex: 1.0.0 @@ -14047,7 +14058,7 @@ packages: shebang-regex: 3.0.0 /shebang-regex@1.0.0: - resolution: {integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=} + resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} engines: {node: '>=0.10.0'} dev: false From 8a60cd55386b42ac4765fbe32e35ba67c32f0c53 Mon Sep 17 00:00:00 2001 From: gradio-pr-bot Date: Fri, 29 Sep 2023 18:30:22 +0000 Subject: [PATCH 7/7] add changeset --- .changeset/heavy-animals-think.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/heavy-animals-think.md b/.changeset/heavy-animals-think.md index 00c30f1dcca55..7e2e4b1952a1d 100644 --- a/.changeset/heavy-animals-think.md +++ b/.changeset/heavy-animals-think.md @@ -3,4 +3,4 @@ "gradio": patch --- -feat:WIP: Fix windows ci build +feat:Fix windows ci build