diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 52855106db4..0f5c2cf27d1 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -99,7 +99,7 @@ jobs: if ($LASTEXITCODE -eq 0) { Write-Host "Successfully pulled cached image with hash tag" $needBuild = $false - } elseif ($output -match 'not found|does not exist|404') { + } elseif ($output -match 'not found|does not exist|404|manifest unknown') { Write-Host "Image not found in registry, will build from scratch." $needBuild = $true } else { diff --git a/build/appveyor/MSVC-appveyor-full.bat b/build/appveyor/MSVC-appveyor-full.bat index d4d2896c651..e0792831341 100644 --- a/build/appveyor/MSVC-appveyor-full.bat +++ b/build/appveyor/MSVC-appveyor-full.bat @@ -152,13 +152,6 @@ IF "%WITH_PYTHON%" == "ON" ( zope.interface>=6.1 || EXIT /B ) -:: Adobe Flex SDK 4.6 for ActionScript -MKDIR "C:\Adobe\Flex\SDK\4.6" || EXIT /B -appveyor DownloadFile https://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip -FileName C:\Adobe\Flex\SDK\4.6\SDK.zip || EXIT /B -CD "C:\Adobe\Flex\SDK\4.6" || EXIT /B -7z x SDK.zip || EXIT /B -SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6" - :: :: Configure and build our software with cmake diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake index 928e19b165d..7c1dddb5e61 100644 --- a/build/cmake/DefineOptions.cmake +++ b/build/cmake/DefineOptions.cmake @@ -44,15 +44,6 @@ if (NOT Boost_USE_STATIC_LIBS) add_definitions(-DBOOST_TEST_DYN_LINK) endif() -# as3 -option(WITH_AS3 "Build ActionScript 3 Thrift Library" ON) -if (WITH_AS3) - set(POSSIBLE_PATHS "${FLEX_HOME}/bin" "$ENV{FLEX_HOME}/bin") - find_program(HAVE_COMPC NAMES compc HINTS ${POSSIBLE_PATHS}) -endif () -CMAKE_DEPENDENT_OPTION(BUILD_AS3 "Build as3 library" ON - "BUILD_LIBRARIES;WITH_AS3;HAVE_COMPC" OFF) - # C++ option(WITH_CPP "Build C++ Thrift library" ON) if(WITH_CPP) @@ -171,10 +162,6 @@ message(STATUS " Build type: ${CMAKE_BUILD_TYPE message(STATUS) message(STATUS "Language libraries:") message(STATUS) -message(STATUS " Build as3 library: ${BUILD_AS3}") -MESSAGE_DEP(WITH_AS3 "Disabled by WITH_AS3=OFF") -MESSAGE_DEP(HAVE_COMPC "Adobe Flex compc was not found - did you set env var FLEX_HOME?") -message(STATUS) message(STATUS " Build with OpenSSL: ${WITH_OPENSSL}") if(WITH_OPENSSL) message(STATUS " Version: ${OPENSSL_VERSION}") diff --git a/build/docker/README.md b/build/docker/README.md index 0f2d293dffa..8bad2378a78 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -175,7 +175,6 @@ Last updated: March 5, 2024 | Tool | ubuntu-focal | ubuntu-jammy | ubuntu-noble | Notes | | :-------- | :------------ | :------------ | :------------ | :---- | | as of | Mar 06, 2018 | Jul 1, 2019 | | | -| as3 | 4.6.0 | 4.6.0 | | | | C++ gcc | 9.4.0 | 11.4.0 | | | | C++ clang | 13.0.0 | 13.0.0 | | | | c\_glib | 3.2.12 | 3.2.12 | | | diff --git a/build/docker/msvc/Dockerfile b/build/docker/msvc/Dockerfile index 01ee11f04f5..821cb5c0536 100644 --- a/build/docker/msvc/Dockerfile +++ b/build/docker/msvc/Dockerfile @@ -80,7 +80,7 @@ RUN C:\BuildTools\Common7\Tools\VsDevCmd.bat -arch=x64 -host_arch=x64 && ` SETX PATH "%ZLIB_ROOT%\bin;%PATH%" # Install OpenSSL 3.6.1 -ADD --checksum=sha256:8ce11c409adbd177ca627115bc697c3b66c414bb36175ebb375341eb426894a8 https://slproweb.com/download/Win64OpenSSL-3_6_1.exe C:\TEMP\openssl.exe +ADD --checksum=sha256:c395482a1af33b2cdd4b801b227c864ed049e0f6aff79413d31b4fa916a67b1a https://slproweb.com/download/Win64OpenSSL-3_6_2.exe C:\TEMP\openssl.exe RUN C:\TEMP\openssl.exe /silent && ` DEL C:\TEMP\openssl.exe && ` SETX OPENSSL_ROOT "C:\OpenSSL-Win64" && ` @@ -93,13 +93,6 @@ RUN choco install jdk8 -y RUN choco install python3 -y RUN pip install setuptools -# Install Adobe Flex 4.6 SDK and set FLEX_HOME so it can be found -ADD --checksum=sha256:622b63f29de44600ff8d4231174a70fcb3085812c0e146a42e91877ca8b46798 http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip C:\Adobe\Flex\SDK\4.6\SDK.zip -RUN CD C:\Adobe\Flex\SDK\4.6 && ` - 7z x SDK.zip && ` - DEL SDK.zip && ` - SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6" - RUN choco install nodejs -y # Start developer command prompt with any other commands specified. diff --git a/build/docker/ubuntu-focal/Dockerfile b/build/docker/ubuntu-focal/Dockerfile index ea1868a165b..eefd31e29de 100644 --- a/build/docker/ubuntu-focal/Dockerfile +++ b/build/docker/ubuntu-focal/Dockerfile @@ -85,13 +85,6 @@ RUN apt-get update -yq && \ vim ENV PATH=/usr/lib/llvm-6.0/bin:$PATH -# lib/as3 (ActionScript) -RUN mkdir -p /usr/local/adobe/flex/4.6 && \ - cd /usr/local/adobe/flex/4.6 && \ - wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \ - unzip flex_sdk_4.6.zip -ENV FLEX_HOME=/usr/local/adobe/flex/4.6 - # TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later. # See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run RUN apt-get install -y --no-install-recommends \ diff --git a/build/docker/ubuntu-jammy/Dockerfile b/build/docker/ubuntu-jammy/Dockerfile index 3fc3da1309c..833c1137ceb 100644 --- a/build/docker/ubuntu-jammy/Dockerfile +++ b/build/docker/ubuntu-jammy/Dockerfile @@ -79,13 +79,6 @@ RUN apt-get update -yq && \ vim ENV PATH=/usr/lib/llvm-6.0/bin:$PATH -# lib/as3 (ActionScript) -RUN mkdir -p /usr/local/adobe/flex/4.6 && \ - cd /usr/local/adobe/flex/4.6 && \ - wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \ - unzip flex_sdk_4.6.zip -ENV FLEX_HOME=/usr/local/adobe/flex/4.6 - # TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later. # See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run RUN apt-get install -y --no-install-recommends \ diff --git a/build/docker/ubuntu-noble/Dockerfile b/build/docker/ubuntu-noble/Dockerfile index bdfb6c2c5ea..7054849c6e6 100644 --- a/build/docker/ubuntu-noble/Dockerfile +++ b/build/docker/ubuntu-noble/Dockerfile @@ -78,13 +78,6 @@ RUN apt-get update -yq && \ vim ENV PATH=/usr/lib/llvm-6.0/bin:$PATH -# lib/as3 (ActionScript) -RUN mkdir -p /usr/local/adobe/flex/4.6 && \ - cd /usr/local/adobe/flex/4.6 && \ - wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \ - unzip flex_sdk_4.6.zip -ENV FLEX_HOME=/usr/local/adobe/flex/4.6 - # TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later. # See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run RUN apt-get install -y --no-install-recommends \