diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml index 894caf94..bade414a 100644 --- a/.github/workflows/build-toolchain.yml +++ b/.github/workflows/build-toolchain.yml @@ -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) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index ac63fb60..3658fe26 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -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 @@ -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", diff --git a/default.xml b/default.xml index 23fadec2..22fbee73 100644 --- a/default.xml +++ b/default.xml @@ -6,10 +6,10 @@ - + - +