version 0.2.30

Author: thomasjm

.aliases/dev-upload-to-github

@@ -1,36 +1,52 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p jq github-cli
 
-set -e
+set -eo pipefail
+
+SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPTDIR"
+
+. ./util.sh
+
+cd ..
 
 for arg do
     shift
 
-    [ "$arg" = "--dry-run" ] && DRY_RUN=t && continue
+    [ "$arg" = "--grand" ] && GRAND="t" && continue
 done
 
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$SCRIPTDIR/.."
+if [[ -n "$GRAND" ]]; then
+  BUILT=$(nix build .#grandCombinedGithubArtifacts \
+    --builders-use-substitutes --no-link --json | jq -r '.[0].outputs.out')
+else
+  BUILT=$(nix build .#githubArtifacts --no-link --json | jq -r '.[0].outputs.out')
+fi
 
-BUILT=$(nix build .#packaged --no-link --json | jq -r '.[0].outputs.out')
-echo "Built:"
-ls -lh "$BUILT"
+echo "Built: $BUILT"
+ls "$BUILT"
 
 VERSION="$(nix eval .#default.version --raw)"
+echo "Got version: $VERSION"
 
-ARTIFACT_LINUX="$BUILT/rust-notebook-language-server-$VERSION-x86_64-linux"
-ARTIFACT_LINUX_ARCHIVE="$ARTIFACT_LINUX.tar.gz"
+IFS=$'\n'
+ARTIFACTS=$(find "$BUILT" -name "*.tar.gz")
+unset IFS
+echo "Saw artifacts:\n\n"
+echo "$ARTIFACTS"
 
 # Smoke check
-$ARTIFACT_LINUX --help 2>&1 > /dev/null
+# FIRST_EXECUTABLE=$(find "$BUILT" -type f -executable | head -n 1)
+# echo "FIRST_EXECUTABLE: $FIRST_EXECUTABLE"
+# $FIRST_EXECUTABLE --help > /dev/null 2>&1
 
-echo "Got artifact: $ARTIFACT_LINUX"
+TAG=v"$VERSION"
 
-if [[ -n "$DRY_RUN" ]]; then
-  exit $?
-fi
+echo ""
+echo "This will tag the current commit as $TAG and upload the above aliases to Git."
+echo ""
+confirm_execution
 
-TAG=v"$VERSION"
 echo "Tagging at $TAG"
 git tag "$TAG" -f
 echo ""
@@ -41,6 +57,6 @@ echo ""
 
 echo "Creating release $TAG"
 gh release create "$TAG" \
-  "$ARTIFACT_LINUX_ARCHIVE" \
+  ${ARTIFACTS[@]} \
   --title "$TAG" \
   --notes ""

.aliases/util.sh

@@ -0,0 +1,17 @@
+
+confirm_execution() {
+    PROMPT="$1"
+    if [[ -z "$PROMPT" ]]; then
+        PROMPT="confirm"
+    fi
+
+    while true; do
+        read -p "Are you sure you want to proceed? Type '$PROMPT' to continue: " input
+        if [[ $input == "$PROMPT" ]]; then
+            echo "Proceeding..."
+            break
+        else
+            echo "Invalid input. Please type '$PROMPT' to continue."
+        fi
+    done
+}

flake.nix

@@ -52,8 +52,8 @@
         flake = (pkgs.hixProject compiler-nix-name).flake {};
         flakeStatic = (pkgs.pkgsCross.musl64.hixProject compiler-nix-name).flake {};
 
-        packageForGitHub = rnls: pkgs.runCommand "rust-notebook-language-server-${rnls.version}" {} ''
-          name="rust-notebook-language-server-${rnls.version}-x86_64-linux"
+        packageForGitHub = rnls: pkgs.runCommand "rust-notebook-language-server-${rnls.version}-${system}" {} ''
+          name="rust-notebook-language-server-${rnls.version}-${system}"
 
           mkdir -p $out
           cp ${rnls}/bin/rust-notebook-language-server $out/$name
@@ -67,9 +67,21 @@
           packages = (rec {
             inherit (pkgs) cabal2nix stack;
 
-            default = flakeStatic.packages."rust-notebook-language-server:exe:rust-notebook-language-server";
+            default = static;
+
+            static = flakeStatic.packages."rust-notebook-language-server:exe:rust-notebook-language-server";
             dynamic = flake.packages."rust-notebook-language-server:exe:rust-notebook-language-server";
-            packaged = packageForGitHub default;
+
+            githubArtifacts = packageForGitHub (if pkgs.stdenv.isDarwin then dynamic else static);
+
+            grandCombinedGithubArtifacts = pkgs.symlinkJoin {
+              name = "rust-notebook-language-server-grand-combined-artifacts";
+              paths = [
+                self.packages.x86_64-linux.githubArtifacts
+                self.packages.x86_64-darwin.githubArtifacts
+                self.packages.aarch64-darwin.githubArtifacts
+              ];
+            };
 
             # No GMP (we test the dynamic builds to make sure GMP doesn't end up in the static builds)
             verify-no-gmp = pkgs.writeShellScriptBin "verify-no-gmp.sh" ''

package.yaml

@@ -1,5 +1,5 @@
 name:                rust-notebook-language-server
-version:             0.2.2.0
+version:             0.2.3.0
 
 extra-source-files:
 - README.md

rust-notebook-language-server.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           rust-notebook-language-server
-version:        0.2.2.0
+version:        0.2.3.0
 build-type:     Simple
 extra-source-files:
     README.md