Skip to content

Commit f16a9e0

Browse files
authored
Update release script (#2631)
… mostly to remove the dependence on Hydra
1 parent 436fe32 commit f16a9e0

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

.travis-functions.sh

-3
This file was deleted.

scripts/release.sh

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,37 @@
11
#! /usr/bin/env nix-shell
2-
#! nix-shell -i bash --packages bash cabal-install cachix curl git skopeo
2+
#! nix-shell -i bash --packages bash cabal-install cachix git skopeo ghc
33

44
set -eux
55

6-
JOBSET=master
7-
8-
. .travis-functions.sh
6+
get_cabal_version() {
7+
grep '^Version: ' < "$1/$1.cabal" | sed -e 's/^Version: *//g';
8+
}
99

1010
function release {
1111
NAME="$1"
1212
VERSION="$(get_cabal_version "${NAME}")"
1313

1414
pushd "${NAME}"
1515
cabal sdist
16-
cabal upload --publish "../dist-newstyle/sdist/${NAME}-${VERSION}.tar.gz"
17-
git clean --force -d -x .
16+
cabal upload --publish "../dist-newstyle/sdist/${NAME}-${VERSION}.tar.gz" || :
1817
popd
1918

20-
nix build --file ./default.nix "${NAME}"
21-
22-
cachix push dhall result
19+
BUILD="$(nix build --file ./default.nix "${NAME}" --print-out-paths)"
2320

24-
curl --location --output "${NAME}-${VERSION}-x86_64-linux.tar.bz2" "https://hydra.dhall-lang.org/job/dhall-haskell/${JOBSET}/tarball-${NAME}/latest/download/1/${NAME}.tar.bz2"
21+
cachix push dhall "${BUILD}"
2522

26-
DOCKER_ARCHIVE="docker-image-${NAME}.tar.gz"
27-
28-
curl --location --remote-name "https://hydra.dhall-lang.org/job/dhall-haskell/${JOBSET}/image-${NAME}/latest/download/1/${DOCKER_ARCHIVE}"
23+
DOCKER_ARCHIVE_DIRECTORY="$(nix build --file ./release.nix "image-${NAME}" --print-out-paths)"
24+
DOCKER_ARCHIVE="${DOCKER_ARCHIVE_DIRECTORY}/docker-image-${NAME}.tar.gz"
2925

3026
skopeo copy --insecure-policy --dest-creds="gabriel439:$(< dockerPassword.txt)" "docker-archive:${DOCKER_ARCHIVE}" "docker://dhallhaskell/${NAME}"
3127

3228
skopeo copy --insecure-policy --dest-creds="gabriel439:$(< dockerPassword.txt)" "docker-archive:${DOCKER_ARCHIVE}" "docker://dhallhaskell/${NAME}:${VERSION}"
33-
34-
rm "${DOCKER_ARCHIVE}"
3529
}
3630

3731
git submodule update
3832

33+
git clean --force -d -x -- dhall*
34+
3935
for package in dhall-lsp-server dhall-openapi dhall-toml dhall-csv dhall-json dhall-yaml dhall-bash dhall-nix dhall-nixpkgs dhall-docs dhall; do
4036
release "${package}"
4137
done

0 commit comments

Comments
 (0)