fix(swift)

prevent clobbering linux tests that expect llvm.org
This commit is contained in:
Jacob Heider 2024-01-22 12:16:55 -05:00
parent 5977c7784e
commit f4a1b94625
No known key found for this signature in database
GPG key ID: 51E3FD0EE62677B6

View file

@ -48,19 +48,23 @@ build:
curl -SfL "$DOWNLOAD_URL" | tar xzf - -C {{ prefix }} --strip-components=2 curl -SfL "$DOWNLOAD_URL" | tar xzf - -C {{ prefix }} --strip-components=2
if: linux if: linux
env: env:
darwin/aarch64: { DOWNLOAD_URL: "https://download.swift.org/swift-{{version}}-release/xcode/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-osx.pkg" } darwin/aarch64:
linux/aarch64: { DOWNLOAD_URL: "https://download.swift.org/swift-{{version}}-release/ubuntu2204-aarch64/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-ubuntu22.04-aarch64.tar.gz" } DOWNLOAD_URL: 'https://download.swift.org/swift-{{version}}-release/xcode/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-osx.pkg'
linux/x86-64: { DOWNLOAD_URL: "https://download.swift.org/swift-{{version}}-release/ubuntu2204/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-ubuntu22.04.tar.gz" } linux/aarch64:
DOWNLOAD_URL: 'https://download.swift.org/swift-{{version}}-release/ubuntu2204-aarch64/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-ubuntu22.04-aarch64.tar.gz'
linux/x86-64:
DOWNLOAD_URL: 'https://download.swift.org/swift-{{version}}-release/ubuntu2204/swift-{{version}}-RELEASE/swift-{{version}}-RELEASE-ubuntu22.04.tar.gz'
# We don't want to smash the llvm dependencies everywhere; this is a secondary provide
provides: provides:
darwin: darwin:
- bin/clang-13 # - bin/clang-13
- bin/clangd # - bin/clangd
- bin/docc - bin/docc
- bin/dsymutil - bin/dsymutil
- bin/llvm-ar # - bin/llvm-ar
- bin/llvm-cov # - bin/llvm-cov
- bin/llvm-profdata # - bin/llvm-profdata
- bin/sourcekit-lsp - bin/sourcekit-lsp
- bin/swift-api-checker.py - bin/swift-api-checker.py
- bin/swift-build-sdk-interfaces - bin/swift-build-sdk-interfaces
@ -73,11 +77,11 @@ provides:
- bin/swift-package - bin/swift-package
- bin/swift-plugin-server - bin/swift-plugin-server
- bin/swift-stdlib-tool - bin/swift-stdlib-tool
- bin/clang # - bin/clang
- bin/clang-cache # - bin/clang-cache
- bin/clang-cl # - bin/clang-cl
- bin/clang-cpp # - bin/clang-cpp
- bin/clang++ # - bin/clang++
- bin/swift - bin/swift
- bin/swift-api-digester - bin/swift-api-digester
- bin/swift-api-extract - bin/swift-api-extract
@ -91,16 +95,16 @@ provides:
- bin/swift-test - bin/swift-test
- bin/swiftc - bin/swiftc
linux: linux:
- bin/clang-13 # - bin/clang-13
- bin/clangd # - bin/clangd
- bin/docc - bin/docc
- bin/lld # - bin/lld
- bin/lldb # - bin/lldb
- bin/lldb-argdumper # - bin/lldb-argdumper
- bin/lldb-server # - bin/lldb-server
- bin/llvm-ar # - bin/llvm-ar
- bin/llvm-cov # - bin/llvm-cov
- bin/llvm-profdata # - bin/llvm-profdata
- bin/plutil - bin/plutil
- bin/repl_swift - bin/repl_swift
- bin/sourcekit-lsp - bin/sourcekit-lsp
@ -113,14 +117,14 @@ provides:
- bin/swift-help - bin/swift-help
- bin/swift-package - bin/swift-package
- bin/swift-plugin-server - bin/swift-plugin-server
- bin/clang # - bin/clang
- bin/clang-cache # - bin/clang-cache
- bin/clang-cl # - bin/clang-cl
- bin/clang-cpp # - bin/clang-cpp
- bin/clang++ # - bin/clang++
- bin/ld.lld # - bin/ld.lld
- bin/ld64.lld # - bin/ld64.lld
- bin/lld-link # - bin/lld-link
- bin/swift - bin/swift
- bin/swift-api-digester - bin/swift-api-digester
- bin/swift-api-extract - bin/swift-api-extract