Skip to content

Update manifest to llvm rebranch revision #299

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Update manifest to llvm rebranch revision #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f076ef1
Update manifest to llvm rebranch revision
mhegazy Jun 23, 2025
fa400d9
Set rebranch as default manifest location
mhegazy Jun 23, 2025
193820e
clang-pseudo was removed in https://github.com/llvm/llvm-project/pull…
mhegazy Jun 23, 2025
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
11 changes: 6 additions & 5 deletions .github/workflows/build-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,12 @@ jobs:

# Which branch is this workflow based on
branch_version_string=${{ inputs.swift_version || '0.0.0' }}
if [[ $branch_version_string == *.* ]]; then
branch_name=$(echo ${branch_version_string} | awk -F. '{ ver=$1"."$2; print (ver == "0.0") ? "main" : "release/"ver }')
else
branch_name="release/$branch_version_string"
fi
#if [[ $branch_version_string == *.* ]]; then
# branch_name=$(echo ${branch_version_string} | awk -F. '{ ver=$1"."$2; print (ver == "0.0") ? "main" : "release/"ver }')
#else
# branch_name="release/$branch_version_string"
#fi
branch_name="rebranch"

repo init --quiet --groups default --depth 1 -u ${{ inputs.repo_url }} -b $branch_name
repo sync --quiet --no-clone-bundle --no-tags --jobs $(nproc --all)
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/swift-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,6 @@ jobs:
run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target lldb-tblgen
- name: Build llvm-config
run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target llvm-config
- name: Build clang-pseudo-gen
run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target clang-pseudo-gen
- name: Build clang-tidy-confusable-chars-gen
run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target clang-tidy-confusable-chars-gen
- name: Build swift-def-to-strings-converter
Expand All @@ -757,7 +755,6 @@ jobs:
"clang-tblgen",
"lldb-tblgen",
"llvm-config",
"clang-pseudo-gen",
"clang-tidy-confusable-chars-gen",
"swift-def-to-strings-converter",
"swift-serialize-diagnostics",
Expand Down
4 changes: 2 additions & 2 deletions default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

<manifest-server url="http://stable.swift.dt.compnerd.org"/>

<project remote="github" name="swiftlang/llvm-project" path="llvm-project" revision="stable/20240723" />
<project remote="github" name="swiftlang/llvm-project" path="llvm-project" revision="stable/20250601" />
<project remote="github" name="swiftlang/indexstore-db" path="indexstore-db" />
<project remote="github" name="swiftlang/sourcekit-lsp" path="sourcekit-lsp" />
<project remote="github" name="swiftlang/swift" path="swift" />
<project remote="github" name="swiftlang/swift" path="swift" revision="rebranch" />
<project remote="github" name="apple/swift-argument-parser" path="swift-argument-parser" revision="refs/tags/1.5.1" />
<project remote="github" name="apple/swift-asn1" path="swift-asn1" revision="refs/tags/1.0.0" />
<project remote="github" name="apple/swift-atomics" path="swift-atomics" revision="refs/tags/1.2.0" />
Expand Down
Loading