From 36a138cb0e461c500c839691259c04dc6fbab550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sun, 27 Mar 2022 21:23:10 +0100
Subject: [PATCH] ci: fix releases pipeline (#219)

---
 .github/workflows/publishing.yml |  2 +-
 .github/workflows/releases.yml   | 62 ++++++++++++++++----------------
 Cross.toml                       |  5 +++
 refinery_cli/Cargo.toml          |  5 +++
 4 files changed, 41 insertions(+), 33 deletions(-)
 create mode 100644 Cross.toml

diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
index 30007458..2016da34 100644
--- a/.github/workflows/publishing.yml
+++ b/.github/workflows/publishing.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'main'
     tags:
-      - 'v*'
+      - "[0-9]+.[0-9]+.[0-9]+"
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index b98ac7b3..08167f6b 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -19,7 +19,7 @@ name: Create and publish refinery releases
 on:
   push:
     tags:
-      - 'v*'
+      - "[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
   create-release:
@@ -65,16 +65,16 @@ jobs:
       PCRE2_SYS_STATIC: 1
     strategy:
       matrix:
-        build: [linux, linux-arm, macos, win-msvc, win-gnu, win32-msvc]
+        build: [linux, linux-deb, macos, win-msvc, win-gnu, win32-msvc]
         include:
         - build: linux
           os: ubuntu-18.04
           rust: nightly
           target: x86_64-unknown-linux-musl
-        - build: linux-arm
+        - build: linux-deb
           os: ubuntu-18.04
           rust: nightly
-          target: arm-unknown-linux-gnueabihf
+          target: x86_64-unknown-linux-gnu
         - build: macos
           os: macos-latest
           rust: nightly
@@ -100,7 +100,7 @@ jobs:
 
     - name: Install packages (Ubuntu)
       if: matrix.os == 'ubuntu-18.04'
-      run: apt-get install -y --no-install-recommends asciidoctor zsh xz-utils liblz4-tool musl-tools brotli zstd
+      run: sudo apt-get install -y --no-install-recommends asciidoctor zsh xz-utils liblz4-tool musl-tools brotli zstd
     - name: Install packages (macOS)
       if: matrix.os == 'macos-latest'
       run: brew install asciidoctor
@@ -115,47 +115,45 @@ jobs:
     - name: Use Cross
       shell: bash
       run: |
-        cargo install cross
+        cargo install cross cargo-deb
         echo "CARGO=cross" >> $GITHUB_ENV
         echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
         echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
-    - name: Show command used for Cargo
-      run: |
-        echo "cargo command is: ${{ env.CARGO }}"
-        echo "target flag is: ${{ env.TARGET_FLAGS }}"
-        echo "target dir is: ${{ env.TARGET_DIR }}"
+
     - name: Build release binary
-      run: ${{ env.CARGO }} build -p refinery_cli --verbose --release --all-features ${{ env.TARGET_FLAGS }}
+      run: |
+        if [ "${{matrix.target}}" = "x86_64-unknown-linux-gnu" ]; then
+          cargo deb -p refinery_cli
+        else
+          ${{ env.CARGO }} build -p refinery_cli --release --all-features ${{ env.TARGET_FLAGS }}
+        fi
 
     - name: Strip release binary (linux and macos)
       if: matrix.build == 'linux' || matrix.build == 'macos'
       run: strip "target/${{ matrix.target }}/release/refinery"
 
-    - name: Strip release binary (arm)
-      if: matrix.build == 'linux-arm'
-      run: |
-        docker run --rm -v \
-          "$PWD/target:/target:Z" \
-          rustembedded/cross:arm-unknown-linux-gnueabihf \
-          arm-linux-gnueabihf-strip \
-          /target/arm-unknown-linux-gnueabihf/release/refinery
     - name: Build archive
       shell: bash
       run: |
-        outdir="$(ci/cargo-out-dir "${{ env.TARGET_DIR }}")"
-        staging="refinery-${{ needs.create-release.outputs.refinery_version }}-${{ matrix.target }}"
-        mkdir -p "$staging"/{complete,doc}
-        cp {README.md,LICENSE} "$staging/"
-        cp CHANGELOG.md "$staging/doc/"
-        if [ "${{ matrix.os }}" = "windows-2019" ]; then
-          cp "target/${{ matrix.target }}/release/refinery.exe" "$staging/"
-          7z a "$staging.zip" "$staging"
-          echo "ASSET=$staging.zip" >> $GITHUB_ENV
+        if [ "${{matrix.target}}" = "x86_64-unknown-linux-gnu" ]; then
+          mv target/debian/refinery_${{ needs.create-release.outputs.refinery_version }}_amd64.deb .
+          echo "ASSET=refinery_${{ needs.create-release.outputs.refinery_version }}_amd64.deb" >> $GITHUB_ENV
         else
-          cp "target/${{ matrix.target }}/release/refinery" "$staging/"
-          tar czf "$staging.tar.gz" "$staging"
-          echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV
+          staging="refinery-${{ needs.create-release.outputs.refinery_version }}-${{ matrix.target }}"
+          mkdir -p "$staging"/doc
+          cp {README.md,LICENSE} "$staging/"
+          cp CHANGELOG.md "$staging/doc/"
+          if [ "${{ matrix.os }}" = "windows-2019" ]; then
+            cp "target/${{ matrix.target }}/release/refinery.exe" "$staging/"
+            7z a "$staging.zip" "$staging"
+            echo "ASSET=$staging.zip" >> $GITHUB_ENV
+          else
+            cp "target/${{ matrix.target }}/release/refinery" "$staging/"
+            tar czf "$staging.tar.gz" "$staging"
+            echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV
+          fi
         fi
+
     - name: Upload release archive
       uses: actions/upload-release-asset@v1.0.1
       env:
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 00000000..1c432121
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,5 @@
+[target.x86_64-unknown-linux-musl]
+image = "ghcr.io/emk/rust-musl-builder:1.57.0"
+
+[target.x86_64-unknown-linux-gnu]
+image = "rust"
diff --git a/refinery_cli/Cargo.toml b/refinery_cli/Cargo.toml
index b250e7a3..d95ec9f7 100644
--- a/refinery_cli/Cargo.toml
+++ b/refinery_cli/Cargo.toml
@@ -38,3 +38,8 @@ tokio = { version = "1.0", features = ["full"], optional = true }
 [dev-dependencies]
 predicates = "2"
 assert_cmd = "2"
+
+[package.metadata.deb]
+name = "refinery"
+maintainer = "João Oliveira <hello@jxs.pt>"
+depends = "libssl-dev"