Commit e3f6be79 authored by Drew's avatar Drew

New packaging regime

parent 9a26e865
Pipeline #1872 failed with stage
......@@ -6,18 +6,16 @@ linux:
script:
- apt-get update
- apt-get install --no-install-recommends xz-utils curl git ca-certificates -y
- curl -L https://github.com/AnarchyTools/atbuild/releases/download/0.9.0/atbuild-0.9.0-linux.tar.xz | tar xJ -C /usr/local
- apt-get install curl -y && curl -s https://packagecloud.io/install/repositories/anarchytools/AT/script.deb.sh | bash && apt-get install --no-install-recommends -y package-deb xz-utils
- git submodule update --init --recursive
- bootstrap/build.sh linux
- tests/test.sh
- mkdir atbuild-${CI_BUILD_REF}
- cp bin/atbuild atbuild-${CI_BUILD_REF}
- tar cJf atbuild-${CI_BUILD_REF}-linux.tar.xz atbuild-${CI_BUILD_REF}
- bin/atbuild check
tags:
- autoscale-linux
artifacts:
paths:
- atbuild-${CI_BUILD_REF}-linux.tar.xz
- bin/atbuild.atbin
- bin/*.deb
image: drewcrawford/swift:latest
osx:
......@@ -27,11 +25,9 @@ osx:
- export PATH=/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin:"${PATH}"
- ./bootstrap/build.sh
- bin/atbuild check
- mkdir atbuild-${CI_BUILD_REF}
- cp bin/atbuild atbuild-${CI_BUILD_REF}
- tar cJf atbuild-${CI_BUILD_REF}-osx.tar.xz atbuild-${CI_BUILD_REF}
tags:
- openswift
artifacts:
paths:
- atbuild-${CI_BUILD_REF}-osx.tar.xz
- bin/atbuild-*.tar.xz
- bin/atbuild.rb
FROM drewcrawford/swift:latest
RUN apt-get update && apt-get install --no-install-recommends xz-utils -y
RUN apt-get update && apt-get install curl -y && curl -s https://packagecloud.io/install/repositories/anarchytools/AT/script.deb.sh | bash && apt-get install --no-install-recommends -y package-deb xz-utils
ADD . /atbuild
WORKDIR atbuild
RUN bootstrap/build.sh linux
......
......@@ -71,6 +71,28 @@
:script "./tests/test.sh"
:dependencies ["atbuild"]
}
:atbin {
:tool "packageatbin"
:name "atbuild"
:compress "true"
:atllbuild-task "atbuild"
:platforms ["all"]
}
:package-linux {
:tool "package-deb.attool"
:name "atbuild"
:dependencies ["atbin"]
:recommends "xz-utils"
:suggests "package-deb"
}
:package-osx {
:tool "package-homebrew.attool"
:name "atbuild"
:github-project "AnarchyTools/atbuild"
:dependencies ["atbin"]
}
}
)
......@@ -10,10 +10,19 @@ ATBUILD="`pwd`/.atllbuild/products/atbuild"
pwd
echo "****************SELF-HOSTING TEST**************"
if ! $ATBUILD atbuild --use-overlay static; then
export ATBUILD_PACKAGE_VERSION="1.2"
echo "Remove this line after releasing 1.2"
if [ "$UNAME" == "Darwin" ]; then
PLATFORM_SPECIFIC_PACKAGE="package-osx"
else
PLATFORM_SPECIFIC_PACKAGE="package-linux"
fi
if ! $ATBUILD $PLATFORM_SPECIFIC_PACKAGE --use-overlay static; then
echo "Self-host failed; maybe you're not running CaffeinatedSwift?"
echo "Retrying with non-static build"
$ATBUILD atbuild
$ATBUILD $PLATFORM_SPECIFIC_PACKAGE
fi
echo "****************ONLY-PLATFORMS TEST**************"
......
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