Skip to content

Commit

Permalink
Bump WebKit submodule (#12310)
Browse files Browse the repository at this point in the history
Co-authored-by: Jarred-Sumner <[email protected]>
  • Loading branch information
Jarred-Sumner and Jarred-Sumner authored Jul 3, 2024
1 parent b85c30c commit dfca814
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,11 @@ jobs:
with:
path: bun-deps
key: bun-${{ inputs.tag }}-deps-${{ steps.hash.outputs.hash }}
- if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
name: Install LLVM
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
name: Install Ninja
run: |
choco install -y ninja
choco install -y llvm --version=${{ env.LLVM_VERSION }} --force
- if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
name: Clone Submodules
run: |
Expand Down Expand Up @@ -151,13 +147,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Install LLVM
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- name: Install Ninja
run: |
choco install -y ninja
choco install -y llvm --version=${{ env.LLVM_VERSION }} --force
- name: Setup Bun
uses: ./.github/actions/setup-bun
with:
Expand Down Expand Up @@ -232,13 +225,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Install LLVM
uses: KyleMayes/install-llvm-action@8b37482c5a2997a3ab5dbf6561f8109e2eaa7d3b
with:
version: ${{ env.LLVM_VERSION }}
- name: Install Ninja
run: |
choco install -y ninja
choco install -y llvm --version=${{ env.LLVM_VERSION }} --force
- name: Setup Bun
uses: ./.github/actions/setup-bun
with:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy(SET CMP0067 NEW)

set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
set(Bun_VERSION "1.1.18")
set(WEBKIT_TAG 00e8a32b3ca72cefae683cd65140428ff1d4ff09)
set(WEBKIT_TAG 615e8585f96aa718b0f5158210259b83fe8440ea)

set(BUN_WORKDIR "${CMAKE_CURRENT_BINARY_DIR}")
message(STATUS "Configuring Bun ${Bun_VERSION} in ${BUN_WORKDIR}")
Expand Down
2 changes: 1 addition & 1 deletion src/bun.js/WebKit
Submodule WebKit updated 1475 files
4 changes: 2 additions & 2 deletions src/bun.js/bindings/webcore/SharedBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ const uint8_t* DataSegment::data() const
#if USE(GSTREAMER)
[](const RefPtr<GstMappedOwnedBuffer>& data) -> const uint8_t* { return data->data(); },
#endif
[](const FileSystem::MappedFileData& data) -> const uint8_t* { return static_cast<const uint8_t*>(data.data()); },
[](const FileSystem::MappedFileData& data) -> const uint8_t* { return static_cast<const uint8_t*>(data.span().data()); },
[](const Provider& provider) -> const uint8_t* { return provider.data(); });
return std::visit(visitor, m_immutableData);
}
Expand All @@ -573,7 +573,7 @@ size_t DataSegment::size() const
#if USE(GSTREAMER)
[](const RefPtr<GstMappedOwnedBuffer>& data) -> size_t { return data->size(); },
#endif
[](const FileSystem::MappedFileData& data) -> size_t { return data.size(); },
[](const FileSystem::MappedFileData& data) -> size_t { return data.span().size(); },
[](const Provider& provider) -> size_t { return provider.size(); });
return std::visit(visitor, m_immutableData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/generated_versions_list.zig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub const boringssl = "29a2cd359458c9384694b75456026e4b57e3e567";
pub const libarchive = "313aa1fa10b657de791e3202c168a6c833bc3543";
pub const mimalloc = "4c283af60cdae205df5a872530c77e2a6a307d43";
pub const picohttpparser = "066d2b1e9ab820703db0837a7255d92d30f0c9f5";
pub const webkit = "00e8a32b3ca72cefae683cd65140428ff1d4ff09";
pub const webkit = "615e8585f96aa718b0f5158210259b83fe8440ea";
pub const zig = @import("std").fmt.comptimePrint("{}", .{@import("builtin").zig_version});
pub const zlib = "886098f3f339617b4243b286f5ed364b9989e245";
pub const tinycc = "ab631362d839333660a265d3084d8ff060b96753";
Expand Down

0 comments on commit dfca814

Please sign in to comment.