update

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+  - package-ecosystem: "docker" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/docker.yaml

@@ -17,16 +17,16 @@ jobs:
     steps:
 
       - name: Check Out Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
-          images: ghcr.io/${{ github.repository_owner }}/atuin
+          images: ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=pr
             type=ref,event=branch
@@ -35,18 +35,18 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: ./
           file: ./Dockerfile
@@ -57,6 +57,7 @@ jobs:
           platforms: linux/amd64 #,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: RUST_BACKTRACE=1
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/nix.yml

@@ -0,0 +1,30 @@
+# Verify the Nix build is working
+# Failures will usually occur due to an out of date Rust version
+# That can be updated to the latest version in nixpkgs-unstable with `nix flake update`
+name: Nix
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/[email protected]
+      - uses: cachix/install-nix-action@v20
+
+      - name: Run nix flake check
+        run: nix flake check --print-build-logs
+
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/[email protected]
+      - uses: cachix/install-nix-action@v20
+
+      - name: Run nix build
+        run: nix build --print-build-logs

.github/workflows/release.yaml

@@ -1,11 +1,16 @@
 name: Release
 
-
 env:
   MIN_SUPPORTED_RUST_VERSION: "1.51.0"
   CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
 
 on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build release binaries for'
+        required: true
+        type: string
   push:
     tags:
       - "v*"
@@ -21,33 +26,51 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu    }
-          - { os: macos-10.15  , target: x86_64-apple-darwin         }
+          - { os: ubuntu-20.04 , target: x86_64-unknown-linux-musl    }
+          - { os: ubuntu-20.04 , target: x86_64-unknown-linux-gnu    }
+          - { os: ubuntu-20.04 , target: aarch64-unknown-linux-gnu    }
+          - { os: macos-12     , target: x86_64-apple-darwin         }
+          - { os: self-hosted     , target: aarch64-apple-darwin         }
     steps:
+    - name: Check for release
+      id: is-release
+      shell: bash
+      run: |
+        unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
+        echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT
+
     - name: Checkout source code
-      uses: actions/checkout@v2
+      if: steps.is-release.outputs.IS_RELEASE
+      uses: actions/checkout@v3
+
+    - name: Checkout source code
+      if: ${{ !steps.is-release.outputs.IS_RELEASE }}
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ inputs.tag }}
 
     - name: Install prerequisites
       shell: bash
       run: |
         case ${{ matrix.job.target }} in
           arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
-          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
+          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu qemu-user;;
+          x86_64-unknown-linux-musl) sudo apt-get -y update ; sudo apt-get -y install musl-tools ;;
         esac
 
     - name: Extract crate information
       shell: bash
       run: |
-        echo "PROJECT_NAME=$(sed -n 's/^name = "\(.*\)"/\1/p' Cargo.toml)" >> $GITHUB_ENV
+        echo "PROJECT_NAME=$(sed -n 's/^name = "\(.*\)"/\1/p' atuin/Cargo.toml)" >> $GITHUB_ENV
         echo "PROJECT_VERSION=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV
         echo "PROJECT_MAINTAINER=$(sed -n 's/^authors = \["\(.*\)"\]/\1/p' Cargo.toml)" >> $GITHUB_ENV
         echo "PROJECT_HOMEPAGE=$(sed -n 's/^homepage = "\(.*\)"/\1/p' Cargo.toml)" >> $GITHUB_ENV
 
     - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
-        target: ${{ matrix.job.target }}
+        targets: ${{ matrix.job.target }}
         override: true
         profile: minimal # minimal component installation (ie, no documentation)
 
@@ -62,11 +85,11 @@ jobs:
         rustc -V
 
     - name: Build
-      uses: actions-rs/cargo@v1
-      with:
-        use-cross: ${{ matrix.job.use-cross }}
-        command: build
-        args: --locked --release --target=${{ matrix.job.target }}
+      run: |
+        case ${{ matrix.job.target }} in
+          aarch64-unknown-linux-gnu) export RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc";;
+        esac;
+        cargo build --locked --release --target=${{ matrix.job.target }}
 
     - name: Strip debug information from executable
       id: strip
@@ -79,6 +102,7 @@ jobs:
         esac;
 
         # Figure out what strip tool to use if any
+        # musl builds use the default strip
         STRIP="strip"
         case ${{ matrix.job.target }} in
           arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;;
@@ -90,7 +114,7 @@ jobs:
         BIN_DIR="${{ env.CICD_INTERMEDIATES_DIR }}/stripped-release-bin/"
         mkdir -p "${BIN_DIR}"
         BIN_NAME="${{ env.PROJECT_NAME }}${EXE_suffix}"
-        BIN_PATH="${BIN_DIR}/${BIN_NAME}"
+        BIN_PATH="${BIN_DIR}${BIN_NAME}"
 
         # Copy the release build binary to the result location
         cp "target/${{ matrix.job.target }}/release/${BIN_NAME}" "${BIN_DIR}"
@@ -101,8 +125,8 @@ jobs:
         fi
 
         # Let subsequent steps know where to find the (stripped) bin
-        echo ::set-output name=BIN_PATH::${BIN_PATH}
-        echo ::set-output name=BIN_NAME::${BIN_NAME}
+        echo "BIN_PATH=${BIN_PATH}" >> "$GITHUB_OUTPUT"
+        echo "BIN_NAME=${BIN_NAME}" >> "$GITHUB_OUTPUT"
 
     - name: Create tarball
       id: package
@@ -111,7 +135,7 @@ jobs:
         PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
         PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }}
         PKG_NAME=${PKG_BASENAME}${PKG_suffix}
-        echo ::set-output name=PKG_NAME::${PKG_NAME}
+        echo "PKG_NAME=${PKG_NAME}" >> "$GITHUB_OUTPUT"
 
         PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
         ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
@@ -124,9 +148,14 @@ jobs:
         # README, LICENSE and CHANGELOG files
         cp "README.md" "LICENSE" "$ARCHIVE_DIR"
 
+        QEMU_PREFIX=""
+        case ${{ matrix.job.target }} in
+          aarch64-unknown-linux-gnu) QEMU_PREFIX="qemu-aarch64 -L /usr/aarch64-linux-gnu" ;;
+        esac;
+
         # Shell completions
         for sh in 'bash' 'fish' 'zsh'; do
-          "${{ steps.strip.outputs.BIN_PATH }}" gen-completions -s $sh -o "${ARCHIVE_DIR}/completions"
+          $QEMU_PREFIX "${{ steps.strip.outputs.BIN_PATH }}" gen-completions -s $sh -o "${ARCHIVE_DIR}/completions"
         done
 
         # base compressed package
@@ -138,15 +167,21 @@ jobs:
         popd >/dev/null
 
         # Let subsequent steps know where to find the compressed package
-        echo ::set-output name=PKG_PATH::"${PKG_STAGING}/${PKG_NAME}"
+        echo "PKG_PATH=${PKG_STAGING}/${PKG_NAME}" >> "$GITHUB_OUTPUT"
+
+    - name: "Artifact upload: tarball"
+      uses: actions/upload-artifact@master
+      with:
+        name: ${{ steps.package.outputs.PKG_NAME }}
+        path: ${{ steps.package.outputs.PKG_PATH }}
 
     - name: Create Debian package
       id: debian-package
       shell: bash
       if: startsWith(matrix.job.os, 'ubuntu')
       run: |
         cargo install cargo-deb
-        cargo deb
+        cargo deb -p atuin
 
         case ${{ matrix.job.target }} in
           aarch64-*-linux-*) DPKG_ARCH=arm64 ;;
@@ -160,14 +195,9 @@ jobs:
         DPKG_PATH="target/debian/${PKG_BASENAME}.deb"
         DPKG_PATH="target/debian/${DPKG_NAME}"
 
-        echo ::set-output name=DPKG_NAME::${DPKG_NAME}
-        echo ::set-output name=DPKG_PATH::${DPKG_PATH}
+        echo DPKG_NAME=${DPKG_NAME} >> $GITHUB_OUTPUT
+        echo DPKG_PATH=${DPKG_PATH} >> $GITHUB_OUTPUT
 
-    - name: "Artifact upload: tarball"
-      uses: actions/upload-artifact@master
-      with:
-        name: ${{ steps.package.outputs.PKG_NAME }}
-        path: ${{ steps.package.outputs.PKG_PATH }}
 
     - name: "Artifact upload: Debian package"
       uses: actions/upload-artifact@master
@@ -176,12 +206,6 @@ jobs:
         name: ${{ steps.debian-package.outputs.DPKG_NAME }}
         path: ${{ steps.debian-package.outputs.DPKG_PATH }}
 
-    - name: Check for release
-      id: is-release
-      shell: bash
-      run: |
-        unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
-        echo ::set-output name=IS_RELEASE::${IS_RELEASE}
 
     - name: Publish archives and packages
       uses: softprops/action-gh-release@v1