Commit 5ebcd69a authored by Drew's avatar Drew

Merge branch 'master' into agressive

parents b7f1a926 194bcfc6
Pipeline #917 failed with stage
......@@ -18,12 +18,6 @@ import Foundation
import atpkg
import attools
#if os(Linux)
//we need to get exit somehow
//https://bugs.swift.org/browse/SR-567
import Glibc
#endif
let defaultBuildFile = "build.atpkg"
func loadPackageFile() -> Package {
......
Subproject commit 07cc9f90bf56cde0c0ce04b53c45c1c03f53bdb8
Subproject commit 3cf366c04c5ed99230ccd9483f1bba03c10d2fc5
......@@ -15,9 +15,6 @@
import Foundation
import atpkg
#if os(Linux)
import Glibc //SR-567
#endif
/**
* The shell tool forks a new process with `/bin/sh -c`. Any arguments specified
......
......@@ -13,9 +13,7 @@
// limitations under the License.
import atpkg
import Foundation
#if os(Linux)
import Glibc //SR-567
#endif
class XCTestRun : Tool {
func run(task: Task) {
guard let testExecutable = task["testExecutable"]?.string else {
......
if [ ! -f artifacts-linux.tgz ]; then
echo "Missing artifacts-linux.tgz"
if [ ! -f artifacts-linux.zip ]; then
echo "Missing artifacts-linux.zip"
exit 1
fi
if [ ! -f artifacts-osx.tgz ]; then
echo "Missing artifacts-osx.tgz"
if [ ! -f artifacts-osx.zip ]; then
echo "Missing artifacts-osx.zip"
exit 1
fi
echo "version to tag:"
read version
tar xf artifacts-linux.tgz
tar c bin/ | pixz -9 -o atbuild-${version}-linux.tar.xz
rm -rf /tmp/build
unzip artifacts-linux.zip -d /tmp/build/
tar c -C /tmp/build bin | pixz -9 -o atbuild-${version}-linux.tar.xz
#the OSX on the other hand is in .atllbuild
rm -rf /tmp/build
mkdir -p /tmp/build/bin
tar xf artifacts-osx.tgz -C /tmp/build/
unzip artifacts-osx.zip -d /tmp/build/
cp /tmp/build/.atllbuild/products/atbuild /tmp/build/bin/atbuild
tar c -C /tmp/build bin | pixz -9 -o atbuild-${version}-macosx.tar.xz
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment