diff --git a/.github/dockerfiles/Dockerfile.clang b/.github/dockerfiles/Dockerfile.clang index 66a50ef68f85..2fe7f110d354 100644 --- a/.github/dockerfiles/Dockerfile.clang +++ b/.github/dockerfiles/Dockerfile.clang @@ -9,7 +9,7 @@ ENV MAKEFLAGS=$MAKEFLAGS \ ERL_TOP=/buildroot/otp \ PATH=/otp/bin:/buildroot/otp/bin:$PATH -RUN sudo apt-get install -y clang +RUN sudo apt-get update && sudo apt-get install -y clang ARG ARCHIVE=./otp.tar.gz COPY $ARCHIVE /buildroot/otp.tar.gz diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 4bd0e90cac80..fb3ef35df663 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -299,7 +299,12 @@ jobs: export ERTS_SKIP_DEPEND=true eval `./otp_build env_win32 x64` ./otp_build configure - if cat erts/CONF_INFO || cat lib/*/CONF_INFO || cat lib/*/SKIP || cat lib/SKIP-APPLICATIONS; then exit 1; fi + if cat erts/CONF_INFO || + grep -v "Static linking with OpenSSL 3.0" lib/*/CONF_INFO || + cat lib/*/SKIP || + cat lib/SKIP-APPLICATIONS; then + exit 1 + fi ./otp_build boot -a ./otp_build release -a cp /mnt/c/opt/local64/pgm/wxWidgets-${{ env.WXWIDGETS_VERSION }}/3rdparty/webview2/runtimes/win-x64/native/WebView2Loader.dll $ERL_TOP/release/win32/erts-*/bin/ @@ -384,6 +389,14 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Cleanup GH Runner + run: | + ## Delete large files from runner to get more disk space + ## See https://github.com/actions/runner-images/issues/2840 + sudo rm -rf /usr/share/dotnet + sudo rm -rf /opt/ghc + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" - name: Cache BASE image uses: actions/cache@v3 if: matrix.type == 'clang' diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile index 9bf3b4429537..4bd7e24f6627 100644 --- a/lib/kernel/test/Makefile +++ b/lib/kernel/test/Makefile @@ -217,7 +217,7 @@ release_tests_spec: make_emakefile $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)" $(INSTALL_DATA) $(APP_FILES) $(EXTRA_FILES) "$(RELSYSDIR)" $(INSTALL_DATA) \ - kernel.spec kernel_smoke.spec kernel_bench.spec logger.spec \ + kernel.spec kernel_smoke.spec kernel_bench.spec kernel_gh.spec logger.spec \ $(EMAKEFILE) $(COVERFILE) "$(RELSYSDIR)" chmod -R u+w "$(RELSYSDIR)" @tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -) diff --git a/lib/kernel/test/kernel_gh.spec b/lib/kernel/test/kernel_gh.spec new file mode 100644 index 000000000000..b47fed2cf5fd --- /dev/null +++ b/lib/kernel/test/kernel_gh.spec @@ -0,0 +1,4 @@ +{suites,"../kernel_test", all}. +{skip_suites,"../kernel_test",[logger_stress_SUITE],"Benchmarks only"}. +{skip_cases, "../kernel_test", global_SUITE, + [many_nodes, lost_connection2, simple_resolve2],"Broken in docker"}. diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile index 98a7a03caa63..bdac775256e6 100644 --- a/lib/stdlib/test/Makefile +++ b/lib/stdlib/test/Makefile @@ -163,7 +163,7 @@ release_spec: opt release_tests_spec: make_emakefile $(INSTALL_DIR) "$(RELSYSDIR)" - $(INSTALL_DATA) stdlib.spec stdlib_bench.spec error_info.spec $(EMAKEFILE) \ + $(INSTALL_DATA) stdlib.spec stdlib_bench.spec stdlib_gh.spec error_info.spec $(EMAKEFILE) \ $(ERL_FILES) $(COVERFILE) $(EXTRA_FILES) "$(RELSYSDIR)" chmod -R u+w "$(RELSYSDIR)" @tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -) diff --git a/lib/stdlib/test/stdlib_gh.spec b/lib/stdlib/test/stdlib_gh.spec new file mode 100644 index 000000000000..147c9209bd39 --- /dev/null +++ b/lib/stdlib/test/stdlib_gh.spec @@ -0,0 +1,9 @@ +{suites,"../stdlib_test",all}. +{skip_groups,"../stdlib_test",stdlib_bench_SUITE, + [binary,base64,gen_server,gen_statem,unicode], + "Benchmark only"}. +{skip_groups,"../stdlib_test",ets_SUITE, + [benchmark], + "Benchmark only"}. +{skip_cases, "../stdlib_test", gen_server_SUITE, + [multicall_remote_old1],"Broken in docker"}.