remove optional

mpromonet · Sep 9, 2024 · 2ed67dc · 2ed67dc
1 parent e8ac872
commit 2ed67dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/cpp-cross-linux-rpi.yml b/.github/workflows/cpp-cross-linux-rpi.yml
@@ -19,7 +19,8 @@ jobs:
         sudo apt-get install -y --no-install-recommends g++ autoconf automake libtool xz-utils libasound2-dev libpulse-dev libgtk-3-dev cmake p7zip-full
         wget -qO- ${CROSSCOMPILER} | tar xz
         ls -l cross-pi-gcc-*/bin
-        echo "$(pwd)/cross-pi-gcc-*/bin" >> $GITHUB_PATH
+        echo "$(pwd)/$(ls -d cross-pi-gcc-*)/bin"
+        echo "$(pwd)/$(ls -d cross-pi-gcc-*)/bin" >> $GITHUB_PATH
       env:
         CROSSCOMPILER: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz
 

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -1,5 +1,5 @@
 # build
-FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 as builder
+FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1-windowsservercore-ltsc2022 as builder
 LABEL [email protected]
 WORKDIR /webrtc-streamer
 COPY . /webrtc-streamer
@@ -15,7 +15,7 @@ RUN powershell.exe -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command
 
 RUN choco install --no-progress -y 7zip git curl sed
 RUN choco install --no-progress -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-RUN choco install --ignoredetectedreboot --no-progress -y visualstudio2022buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --includeOptional --nocache --installPath %MSVC_PATH%" || IF "%ERRORLEVEL%"=="3010" EXIT 0
+RUN choco install --ignoredetectedreboot --no-progress -y visualstudio2022buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --nocache --installPath %MSVC_PATH%" || IF "%ERRORLEVEL%"=="3010" EXIT 0
 
 RUN git config --global core.autocrlf false \
        && git config --global core.filemode false \