Add nightly builds

.circleci/config.yml

@@ -119,10 +119,14 @@ jobs:
   # Publish a new release. This only runs when a release is tagged (see
   # workflow below).
   release:
-    docker:
-      - image: nixos/nix:2.3
+    machine: true
     steps:
       - checkout
+      - run:
+          name: Install Nix
+          command: |
+            curl -L https://nixos.org/nix/install | sh
+            echo "source $HOME/.nix-profile/etc/profile.d/nix.sh" >> $BASH_ENV
       - run:
           name: Install and use the Cachix binary cache
           command: |
@@ -136,14 +140,13 @@ jobs:
           command: |
             export GITHUB_USERNAME="$CIRCLE_PROJECT_USERNAME"
             export GITHUB_REPONAME="$CIRCLE_PROJECT_REPONAME"
-            postgrest-release-github
-      - setup_remote_docker
+            postgrest-release-github $CIRCLE_TAG
       - run:
           name: Publish Docker images
           command: |
             export DOCKER_REPO=postgrest
-            docker login -u $DOCKER_USER -p $DOCKER_PASS
-            postgrest-release-dockerhub
+            postgrest-docker-login
+            postgrest-release-dockerhub $CIRCLE_TAG
             postgrest-release-dockerhubdescription
 
   # Build everything in default.nix, push to the Cachix binary cache and run tests

.travis.yml

@@ -55,14 +55,24 @@ jobs:
           then
             echo 'No tag pushed. Skipping release.'
           else
-            OWNER="$(echo "$TRAVIS_REPO_SLUG" | cut -f1 -d/)"
-            REPO="$(echo "$TRAVIS_REPO_SLUG" | cut -f2 -d/)"
-            START=$(echo $TRAVIS_TAG | cut -c2-)
-            END='## \['
-            BODY=$(sed -n "1,/$START/d;/$END/q;p" CHANGELOG.md)
-            strip postgrest
-            tar cJf postgrest-$TRAVIS_TAG-osx.tar.xz postgrest
-            ghr -t $GITHUB_TOKEN -u $OWNER -r $REPO -b "$BODY"--replace $TRAVIS_TAG postgrest-$TRAVIS_TAG-osx.tar.xz
+            owner="$(echo "$TRAVIS_REPO_SLUG" | cut -f1 -d/)"
+            repo="$(echo "$TRAVIS_REPO_SLUG" | cut -f2 -d/)"
+            if test $TRAVIS_TAG = "nightly"
+            then
+              date=$(date +'%F')
+              sha=$(echo $TRAVIS_COMMIT | head -c7)
+              suffix=$date-$sha
+              strip postgrest
+              tar cJf postgrest-nightly-$suffix-osx.tar.xz postgrest
+              ghr -t $GITHUB_TOKEN -u $owner -r $repo --replace nightly postgrest-nightly-$suffix-osx.tar.xz
+            else
+              start=$TRAVIS_TAG
+              end='## \['
+              body=$(sed -n "1,/$start/d;/$end/q;p" CHANGELOG.md)
+              strip postgrest
+              tar cJf postgrest-$TRAVIS_TAG-osx.tar.xz postgrest
+              ghr -t $GITHUB_TOKEN -u $owner -r $repo -b "$body"--replace $TRAVIS_TAG postgrest-$TRAVIS_TAG-osx.tar.xz
+            fi
           fi
 
     - name: Code Coverage

appveyor.yml

@@ -32,5 +32,16 @@ artifacts:
 - path: postgrest.exe
 
 deploy_script:
-- IF DEFINED APPVEYOR_REPO_TAG_NAME 7z a -tzip postgrest-%APPVEYOR_REPO_TAG_NAME%-windows-x64.zip postgrest.exe
-- IF DEFINED APPVEYOR_REPO_TAG_NAME bash -lc " exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ghr -t $GITHUB_TOKEN -u $APPVEYOR_ACCOUNT_NAME -r $APPVEYOR_PROJECT_NAME -b \"$(sed -n \"1,/$(echo $APPVEYOR_REPO_TAG_NAME | cut -c2-)/d;/## \[/q;p\" CHANGELOG.md)\" --replace $APPVEYOR_REPO_TAG_NAME postgrest-$APPVEYOR_REPO_TAG_NAME-windows-x64.zip"
+## set the env vars outside of the IF because that doesn't work: https://stackoverflow.com/questions/9102422/windows-batch-set-inside-if-not-working
+- set DATE=%APPVEYOR_REPO_COMMIT_TIMESTAMP:~0,10%
+- set SHA=%APPVEYOR_REPO_COMMIT:~0,7%
+- set SUFFIX=%DATE%-%SHA%
+- IF DEFINED APPVEYOR_REPO_TAG_NAME (
+    IF "%APPVEYOR_REPO_TAG_NAME%"=="nightly" (
+      7z a -tzip postgrest-nightly-%SUFFIX%-windows-x64.zip postgrest.exe &&
+      bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ghr -t $GITHUB_TOKEN -u $APPVEYOR_ACCOUNT_NAME -r $APPVEYOR_PROJECT_NAME --replace nightly postgrest-nightly-$SUFFIX-windows-x64.zip"
+    ) ELSE (
+      7z a -tzip postgrest-%APPVEYOR_REPO_TAG_NAME%-windows-x64.zip postgrest.exe &&
+      bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ghr -t $GITHUB_TOKEN -u $APPVEYOR_ACCOUNT_NAME -r $APPVEYOR_PROJECT_NAME -b \"`sed -n \"1,/$APPVEYOR_REPO_TAG_NAME/d;/## \[/q;p\" CHANGELOG.md`\" --replace $APPVEYOR_REPO_TAG_NAME postgrest-$APPVEYOR_REPO_TAG_NAME-windows-x64.zip"
+    )
+  )

nix/release/default.nix

@@ -12,34 +12,36 @@ let
   # Version from the postgrest.cabal file (gotten with callCabal2nix).
   version = postgrest.version;
 
-  # Set of files that will be published in the GitHub release.
-  releaseFiles =
-    runCommand "postgrest-release-files"
-      { inherit postgrest version; }
-      ''
-        set -euo pipefail
-
-        mkdir -p $out
-
-        tar cvJf "$out"/postgrest-v"$version"-linux-x64-static.tar.xz \
-          -C "$postgrest"/bin postgrest
-      '';
-
   # Script for publishing a new release on GitHub.
   github =
     writeShellScriptBin "postgrest-release-github"
       ''
         set -euo pipefail
 
-        changes="$(sed -n "1,/${version}/d;/## \[/q;p" ${../../CHANGELOG.md})"
+        version=$1
+
+        changes="$(sed -n "1,/$version/d;/## \[/q;p" ${../../CHANGELOG.md})"
+
+        tar cvJf postgrest-$version-linux-x64-static.tar.xz \
+          -C ${postgrest}/bin postgrest
 
         ${ghr}/bin/ghr \
           -t "$GITHUB_TOKEN" \
           -u "$GITHUB_USERNAME" \
           -r "$GITHUB_REPONAME" \
           -b "$changes" \
-          --replace v${version} \
-          ${releaseFiles}
+          --replace $version \
+          postgrest-$version-linux-x64-static.tar.xz
+      '';
+
+  # Wrapper for login with docker. $DOCKER_USER/$DOCKER_PASS vars come from CircleCI.
+  # The DOCKER_USER is not the same as DOCKER_REPO because we use the https://hub.docker.com/u/postgrestbot account for uploading to dockerhub.
+  dockerLogin =
+    writeShellScriptBin "postgrest-docker-login"
+      ''
+        set -euo pipefail
+
+        docker login -u $DOCKER_USER -p $DOCKER_PASS
       '';
 
   # Script for publishing a new release on Docker Hub.
@@ -48,13 +50,15 @@ let
       ''
         set -euo pipefail
 
+        version=$1
+
         docker load -i ${docker.image}
 
         docker tag postgrest:latest "$DOCKER_REPO"/postgrest:latest
-        docker tag postgrest:latest "$DOCKER_REPO"/postgrest:v${version}
+        docker tag postgrest:latest "$DOCKER_REPO"/postgrest:$version
 
         docker push "$DOCKER_REPO"/postgrest:latest
-        docker push "$DOCKER_REPO"/postgrest:v${version}
+        docker push "$DOCKER_REPO"/postgrest:$version
       '';
 
   # Script for updating the repository description on Docker Hub.
@@ -72,9 +76,9 @@ let
 
         # Login to Docker Hub and get a token.
         token="$(
-          ${curl}/bin/curl -sH "Content-Type: application/json" \
-            --data-urlencode "username=$DOCKER_USERNAME" \
-            --data-urlencode "password=$DOCKER_PASSWORD" \
+          ${curl}/bin/curl -s \
+            --data-urlencode "username=$DOCKER_USER" \
+            --data-urlencode "password=$DOCKER_PASS" \
             "https://hub.docker.com/v2/users/login/" \
             | ${jq}/bin/jq -r .token
         )"
@@ -97,5 +101,5 @@ let
 in
 buildEnv {
   name = "postgrest-release";
-  paths = [ github dockerHub dockerHubDescription ];
+  paths = [ github dockerLogin dockerHub dockerHubDescription ];
 }