Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TEST Do not submit #601

Closed
wants to merge 2 commits into from
Closed

TEST Do not submit #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e11eb70
Update visual studio version to include llvm clang17 (#599)
briantting Mar 11, 2024
34b6241
TEST Do not submit
niranjanyardi Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/toolchain/win/msvc_toolchain.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

## Test , DO NOT SUBMIT

assert(use_cobalt_customizations)

import("//build/toolchain/cc_wrapper.gni")
Expand Down
2 changes: 1 addition & 1 deletion docker/windows/base/visualstudio2022/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY dockerized_install_visual_studio_2022.ps1 /dockerized_install_visual_studio
# Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1).
# This should be kept in sync with the VS installer used in the dev workstation
# setup script in: `tools/install_visual_studio_22.ps1`
ARG MSVS_INSTALLER_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/38b09fc09ae9e590b73ae6752a0ebfd62579798969041bd341689273b842bc10/vs_BuildTools.exe"
ARG MSVS_INSTALLER_URL="https://download.visualstudio.microsoft.com/download/pr/63fee7e3-bede-41ad-97a2-97b8b9f535d1/d4af71832828f344373f7366c2af3461a83569d297dee8b43d30b7da71e9b5ed/vs_BuildTools.exe"
RUN C:\dockerized_install_visual_studio_2022.ps1 ${env:MSVS_INSTALLER_URL}

ENV VSINSTALLDIR "C:\BuildTools"
Expand Down
20 changes: 0 additions & 20 deletions starboard/build/config/modular/variables.gni
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/install_visual_studio_22.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ New-Item -Path "C:\" -Name "src" -ItemType "directory" -Force
# Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1).
# This should be kept in sync with the VS installer used in Build CI containers
# defined in `docker/windows/base/visualstudio2022/Dockerfile`
$VS_INSTALL_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/30be9c2a5e40d5666eeae683e319b472c8bcc8231c7b346fe798f0ad0f7e498b/vs_Professional.exe"
$VS_INSTALL_URL="https://download.visualstudio.microsoft.com/download/pr/63fee7e3-bede-41ad-97a2-97b8b9f535d1/2c37061fd2dc51c1283d9e9476437a2b0f211250e514df07c4b9827b95e8d849/vs_Professional.exe"

Invoke-WebRequest -Uri $VS_INSTALL_URL -OutFile C:\src\vs_professional.exe

Expand Down
Loading