-
-
Notifications
You must be signed in to change notification settings - Fork 661
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into out_of_curiosity_(don't_freak_out)
# Conflicts: # .github/workflows/main.yml # libs/ilib/dune # libs/ilib/peReader.ml # libs/javalib/dune # src-json/define.json # src/codegen/dotnet.ml # src/codegen/gencommon/castDetect.ml # src/codegen/gencommon/closuresToClass.ml # src/codegen/gencommon/dynamicFieldAccess.ml # src/codegen/gencommon/dynamicOperators.ml # src/codegen/gencommon/enumToClass.ml # src/codegen/gencommon/enumToClass2.ml # src/codegen/gencommon/expressionUnwrap.ml # src/codegen/gencommon/filterClosures.ml # src/codegen/gencommon/fixOverrides.ml # src/codegen/gencommon/gencommon.ml # src/codegen/gencommon/initFunction.ml # src/codegen/gencommon/overloadingConstructor.ml # src/codegen/gencommon/realTypeParams.ml # src/codegen/gencommon/reflectionCFs.ml # src/codegen/gencommon/switchToIf.ml # src/codegen/gencommon/unnecessaryCastsRemoval.ml # src/codegen/gencommon/unreachableCodeEliminationSynf.ml # src/codegen/java.ml # src/codegen/javaModern.ml # src/context/common.ml # src/dune # src/filters/filters.ml # src/generators/gencs.ml # src/generators/genjava.ml # src/generators/genshared.ml # src/optimization/analyzerTexpr.ml # src/typing/matcher.ml # src/typing/typeloadCheck.ml # src/typing/typeloadFields.ml # src/typing/typeloadModule.ml # src/typing/typer.ml # std/cs/_std/Type.hx # tests/server/src/cases/ServerTests.hx
- Loading branch information
Showing
511 changed files
with
10,392 additions
and
8,083 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| (data_only_dirs extra lib std tests) | ||
| (dirs :standard \ tests std extra) | ||
| (data_only_dirs lib) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| - name: choco install nsis | ||
| uses: nick-invision/retry@v1 | ||
| uses: nick-invision/retry@v2 | ||
| with: | ||
| timeout_minutes: 10 | ||
| max_attempts: 10 | ||
| command: choco install --no-progress nsis.portable --version 3.02 -y | ||
| command: choco install --no-progress nsis.portable --version 3.09 -y | ||
|
|
||
| - name: choco install things | ||
| shell: pwsh | ||
| run: choco install --no-progress curl wget 7zip.portable -y | ||
|
|
||
| - name: Prepend Chocolatey path | ||
| shell: pwsh | ||
| run: Write-Host "::add-path::C:\ProgramData\chocolatey\bin" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,6 @@ | ||
| - name: Install OCaml libraries | ||
| if: steps.cache-opam.outputs.cache-hit != 'true' | ||
| shell: pwsh | ||
| run: | | ||
| Set-PSDebug -Trace 1 | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'opam init mingw "https://github.com/fdopen/opam-repository-mingw.git#opam2" --comp 4.07.0+mingw${ARCH}c --switch 4.07.0+mingw${ARCH}c --auto-setup --yes 2>&1') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'opam update --yes 2>&1') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam pin add haxe . --kind=path --no-action --yes 2>&1') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'opam install haxe --deps-only --yes 2>&1') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'opam list') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'ocamlopt -v') | ||
| opam install haxe --deps-only | ||
| opam list |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,39 @@ | ||
| - name: Install OCaml | ||
| - name: Setup ocaml | ||
| id: ocaml | ||
| continue-on-error: true | ||
| uses: kLabz/setup-ocaml@win32 | ||
| with: | ||
| ocaml-compiler: 4.08.1 | ||
| opam-depext: false | ||
| opam-repositories: | | ||
| opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset | ||
| default: https://github.com/ocaml/opam-repository.git | ||
| opam-local-packages: | | ||
| haxe.opam | ||
| cache-prefix: w32-v1 | ||
|
|
||
| # TODO make it work on first try | ||
| # (when cygwin cache doesn't exist, ocaml install fails with a curl error) | ||
| - name: Setup ocaml (second chance) | ||
| if: steps.ocaml.outcome == 'failure' | ||
| uses: kLabz/setup-ocaml@win32 | ||
| with: | ||
| ocaml-compiler: 4.08.1 | ||
| opam-depext: false | ||
| opam-repositories: | | ||
| opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset | ||
| default: https://github.com/ocaml/opam-repository.git | ||
| opam-local-packages: | | ||
| haxe.opam | ||
| cache-prefix: w32-v1 | ||
|
|
||
| - name: Install dependencies | ||
| shell: pwsh | ||
| run: | | ||
| Set-PSDebug -Trace 1 | ||
| curl.exe -fsSL -o cygwin-setup.exe --retry 3 $($env:CYGWIN_SETUP) | ||
| Start-Process -FilePath "cygwin-setup.exe" -ArgumentList "-B -q -R $($env:CYG_ROOT) -l C:/tmp -s $($env:CYG_MIRROR) -P default -P make -P git -P zlib-devel -P rsync -P patch -P diffutils -P curl -P unzip -P tar -P m4 -P perl -P libpcre2-devel -P mbedtls-devel -P mingw64-$($env:MINGW_ARCH)-zlib -P mingw64-$($env:MINGW_ARCH)-gcc-core -P mingw64-$($env:MINGW_ARCH)-pcre2 --allow-unsupported-windows" -Wait -RedirectStandardOutput cygwin-setup-out.txt | ||
| Get-Content cygwin-setup-out.txt | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('--norc', '--noprofile', '/etc/postinstall/ca-certificates.sh') | ||
| curl.exe -fsSL -o "opam.tar.xz" --retry 3 https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam$($env:ARCH).tar.xz | ||
| curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 https://github.com/Simn/mingw64-mbedtls/releases/download/2.16.3/mingw64-$($env:MINGW_ARCH)-mbedtls-2.16.3-1.tar.xz | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'curl -L https://cpanmin.us | perl - App::cpanminus') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cpanm IPC::System::Simple module') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cpanm String::ShellQuote') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'echo "$OLDPWD"') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && tar -C / -xvf libmbedtls.tar.xz') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && tar -xf opam.tar.xz') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && bash opam${ARCH}/install.sh') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,20 @@ | ||
| - name: Install OCaml | ||
| - name: Setup ocaml | ||
| uses: ocaml/setup-ocaml@v2 | ||
| with: | ||
| ocaml-compiler: 4.08.1 | ||
| opam-repositories: | | ||
| opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset | ||
| default: https://github.com/ocaml/opam-repository.git | ||
| opam-local-packages: | | ||
| haxe.opam | ||
| - name: Install dependencies | ||
| shell: pwsh | ||
| run: | | ||
| Set-PSDebug -Trace 1 | ||
| curl.exe -fsSL -o cygwin-setup.exe --retry 3 $($env:CYGWIN_SETUP) | ||
| Start-Process -FilePath "cygwin-setup.exe" -ArgumentList "-B -q -R $($env:CYG_ROOT) -l C:/tmp -s $($env:CYG_MIRROR) -P default -P make -P git -P zlib-devel -P rsync -P patch -P diffutils -P curl -P unzip -P tar -P m4 -P perl -P libpcre2-devel -P mbedtls-devel -P mingw64-$($env:MINGW_ARCH)-zlib -P mingw64-$($env:MINGW_ARCH)-gcc-core -P mingw64-$($env:MINGW_ARCH)-pcre2" -Wait -RedirectStandardOutput cygwin-setup-out.txt | ||
| Get-Content cygwin-setup-out.txt | ||
| curl.exe -fsSL -o "opam.tar.xz" --retry 3 https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam$($env:ARCH).tar.xz | ||
| curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 https://github.com/Simn/mingw64-mbedtls/releases/download/2.16.3/mingw64-$($env:MINGW_ARCH)-mbedtls-2.16.3-1.tar.xz | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'curl -L https://cpanmin.us | perl - App::cpanminus') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cpanm IPC::System::Simple module') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cpanm String::ShellQuote') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'echo "$OLDPWD"') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && tar -C / -xvf libmbedtls.tar.xz') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && tar -xf opam.tar.xz') | ||
| & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && bash opam${ARCH}/install.sh') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18.17.1 | ||
|
|
||
| # - name: Quick test | ||
| # shell: pwsh | ||
| # run: | | ||
|
|
||
Oops, something went wrong.