Skip to content

Commit

Permalink
Skip invalid combinations
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewKahr committed Oct 27, 2023
1 parent b7b1db9 commit 1dd33a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ jobs:
# No Windows 2018 Android Builds. Issues with 2021.1 and 2021.2 so they are skipped too
WINDOWS_EXCLUDES="$WINDOWS_EXCLUDES `echo \"$VERSIONS\" | jq -c '[ .[] | select(test(\"2018|2021.1|2021.2\")) | { version: ., module: \"android\"} ]'`"
# No Windows mono Builds for Unity 2019.2 or earlier. Issues with 2021.1 and 2021.2 so they are skipped too
WINDOWS_EXCLUDES="$WINDOWS_EXCLUDES `echo \"$VERSIONS\" | jq -c '[ .[] | select(test(\"2018|2019.1|2019.2|2021.1|2021.2\")) | { version: ., module: \"base\"} ]'`"
LINUX_EXCLUDES=`echo "$LINUX_EXCLUDES" | jq -s -c 'flatten'`
WINDOWS_EXCLUDES=`echo "$WINDOWS_EXCLUDES" | jq -s -c 'flatten'`
Expand Down
2 changes: 1 addition & 1 deletion images/windows/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG windowsDllSourceImage="mcr.microsoft.com/windows/server:ltsc2022"
ARG windowsImage="mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022"

# Need this image to grab missing dlls for the server core version
FROM $windowsDllSourceImage as dll-source
FROM $windowsDllSourceImage AS dll-source

# We use the .net framework servercore image because we will need the .net support
# anyway and there is no real benefit to try and make this smaller by
Expand Down

0 comments on commit 1dd33a4

Please sign in to comment.