diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5341254576b..8240387156d 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -59,6 +59,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml index 48353912a09..a4a31fa680d 100644 --- a/.github/workflows/gui.yml +++ b/.github/workflows/gui.yml @@ -30,6 +30,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - id: changed_files run: |- git fetch @@ -90,6 +91,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -147,6 +149,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -206,6 +209,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -265,6 +269,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -322,6 +327,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -381,6 +387,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -449,6 +456,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -508,6 +516,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -570,6 +579,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -630,6 +640,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -692,6 +703,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -753,6 +765,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 619003074e7..39edb6de253 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -50,6 +50,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -107,6 +108,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -168,6 +170,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -230,6 +233,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -294,6 +298,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -359,6 +364,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -431,6 +437,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -500,6 +507,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -566,6 +574,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -634,6 +643,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -643,6 +653,8 @@ jobs: --backend-release ${{env.ENSO_RELEASE_ID}} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT_PASSWORD }} + WIN_CSC_LINK: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT }} - name: List files if failed (Windows) run: Get-ChildItem -Force -Recurse if: failure() && runner.os == 'Windows' diff --git a/.github/workflows/scala-new.yml b/.github/workflows/scala-new.yml index bf50c23693e..80c40708005 100644 --- a/.github/workflows/scala-new.yml +++ b/.github/workflows/scala-new.yml @@ -61,6 +61,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -126,6 +127,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: @@ -193,6 +195,7 @@ jobs: uses: actions/checkout@v2 with: clean: false + submodules: recursive - name: Build Script Setup run: ./run --help env: diff --git a/Cargo.lock b/Cargo.lock index 46e62150447..971ca3efb6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1858,7 +1858,7 @@ dependencies = [ [[package]] name = "enso-build" version = "0.1.0" -source = "git+https://github.com/enso-org/ci-build?branch=develop#3d97503dc945a4b79a4b8c29bbcf0cc07ac3571e" +source = "git+https://github.com/enso-org/ci-build?branch=develop#62db6dfa54b858f997bd5aa4e4cc906bc4c9880d" dependencies = [ "anyhow", "async-compression", @@ -1934,7 +1934,7 @@ dependencies = [ [[package]] name = "enso-build-cli" version = "0.1.0" -source = "git+https://github.com/enso-org/ci-build?branch=develop#3d97503dc945a4b79a4b8c29bbcf0cc07ac3571e" +source = "git+https://github.com/enso-org/ci-build?branch=develop#62db6dfa54b858f997bd5aa4e4cc906bc4c9880d" dependencies = [ "anyhow", "byte-unit", @@ -3845,10 +3845,10 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" dependencies = [ - "base64 0.10.1", + "base64 0.11.0", "bytes 1.1.0", "http", - "httpdate 0.3.2", + "httpdate 1.0.2", "language-tags 0.3.2", "mime 0.3.16", "percent-encoding 2.1.0", @@ -3858,7 +3858,7 @@ dependencies = [ [[package]] name = "ide-ci" version = "0.1.0" -source = "git+https://github.com/enso-org/ci-build?branch=develop#3d97503dc945a4b79a4b8c29bbcf0cc07ac3571e" +source = "git+https://github.com/enso-org/ci-build?branch=develop#62db6dfa54b858f997bd5aa4e4cc906bc4c9880d" dependencies = [ "anyhow", "async-compression", diff --git a/app/ide-desktop/lib/content/esbuild-config.ts b/app/ide-desktop/lib/content/esbuild-config.ts index 9e3f529abfb..1499b50ff74 100644 --- a/app/ide-desktop/lib/content/esbuild-config.ts +++ b/app/ide-desktop/lib/content/esbuild-config.ts @@ -17,6 +17,7 @@ import { fileURLToPath } from 'node:url' import esbuild from 'esbuild' import plugin_yaml from 'esbuild-plugin-yaml' import { NodeModulesPolyfillPlugin } from '@esbuild-plugins/node-modules-polyfill' +import { NodeGlobalsPolyfillPlugin } from '@esbuild-plugins/node-globals-polyfill' import aliasPlugin from 'esbuild-plugin-alias' // @ts-ignore import timePlugin from 'esbuild-plugin-time' @@ -93,6 +94,7 @@ const config: esbuild.BuildOptions = { plugins: [ plugin_yaml.yamlPlugin({}), NodeModulesPolyfillPlugin(), + NodeGlobalsPolyfillPlugin({ buffer: true, process: true }), aliasPlugin({ wasm_rust_glue: js_glue_path }), timePlugin(), copy_plugin.create(files_to_copy_provider), diff --git a/app/ide-desktop/lib/content/package.json b/app/ide-desktop/lib/content/package.json index 2db25d786fc..f8824498c1b 100644 --- a/app/ide-desktop/lib/content/package.json +++ b/app/ide-desktop/lib/content/package.json @@ -30,6 +30,7 @@ }, "devDependencies": { "@esbuild-plugins/node-modules-polyfill": "^0.1.4", + "@esbuild-plugins/node-globals-polyfill": "^0.1.1", "esbuild": "^0.14.43", "esbuild-dev-server": "^0.3.0", "esbuild-copy-static-files": "^0.1.0", diff --git a/run.cmd b/run.cmd index 0fbf00b7782..0aa2a4f8648 100644 --- a/run.cmd +++ b/run.cmd @@ -3,3 +3,4 @@ pushd %~dp0 @ set TARGET_EXE=%TARGET_DIR%\buildscript\enso-build3.exe cargo build --profile buildscript --target-dir "%TARGET_DIR%" --package enso-build3 && "%TARGET_EXE%" %* popd +exit /b %ERRORLEVEL%