ci: fix auto release

pythonbrad · pythonbrad · commit 4bf25b6af258 · 2024-04-14T09:58:03.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,21 +23,21 @@ jobs:
         uses: actions/checkout@v4
       - name: Get the release version from the tag
         if: env.VERSION == ''
-        run: echo "VERSION=$(echo ${{ github.ref_name }} | sed 's/v\(.*\)-.*/\1/')" >> $GITHUB_ENV
+        run: echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
       - name: Show the version
         run: |
           echo "version is: $VERSION"
       - name: Check that tag version and Cargo.toml version are the same
         shell: bash
         run: |
-          if ! grep -q "version = \"$VERSION\"" Cargo.toml; then
+          if ! grep -q "version = \"$(echo $VERSION | sed 's/v\(.*\)-.*/\1/')\"" Cargo.toml; then
             echo "version does not match Cargo.toml" >&2
             exit 1
           fi
       - name: Create GitHub release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release create v$VERSION --verify-tag --draft --title $VERSION
+        run: gh release create $VERSION --verify-tag --draft --title $VERSION
     outputs:
       version: ${{ env.VERSION }}
 
@@ -70,135 +70,95 @@ jobs:
             rust: nightly
             target: x86_64-unknown-linux-musl
             strip: x86_64-linux-musl-strip
-          - build: stable-x86
-            os: ubuntu-latest
-            rust: stable
-            target: i686-unknown-linux-gnu
-            strip: x86_64-linux-gnu-strip
-            qemu: i386
-          - build: stable-aarch64
-            os: ubuntu-latest
-            rust: stable
-            target: aarch64-unknown-linux-gnu
-            strip: aarch64-linux-gnu-strip
-            qemu: qemu-aarch64
-          - build: stable-arm-gnueabihf
-            os: ubuntu-latest
-            rust: stable
-            target: armv7-unknown-linux-gnueabihf
-            strip: arm-linux-gnueabihf-strip
-            qemu: qemu-arm
-          - build: stable-arm-musleabihf
-            os: ubuntu-latest
-            rust: stable
-            target: armv7-unknown-linux-musleabihf
-            strip: arm-linux-musleabihf-strip
-            qemu: qemu-arm
-          - build: stable-arm-musleabi
-            os: ubuntu-latest
-            rust: stable
-            target: armv7-unknown-linux-musleabi
-            strip: arm-linux-musleabi-strip
-            qemu: qemu-arm
-          - build: stable-powerpc64
-            os: ubuntu-latest
-            rust: stable
-            target: powerpc64-unknown-linux-gnu
-            strip: powerpc64-linux-gnu-strip
-            qemu: qemu-ppc64
-          - build: stable-s390x
-            os: ubuntu-latest
-            rust: stable
-            target: s390x-unknown-linux-gnu
-            strip: s390x-linux-gnu-strip
-            qemu: qemu-s390x
-          - build: macos
-            os: macos-latest
-            rust: nightly
-            target: x86_64-apple-darwin
-          - build: win-msvc
-            os: windows-latest
-            rust: nightly
-            target: x86_64-pc-windows-msvc
-          - build: win-gnu
-            os: windows-latest
-            rust: nightly-x86_64-gnu
-            target: x86_64-pc-windows-gnu
-          - build: win32-msvc
-            os: windows-latest
-            rust: nightly
-            target: i686-pc-windows-msvc
+#          - build: stable-x86
+#            os: ubuntu-latest
+#            rust: stable
+#            target: i686-unknown-linux-gnu
+#            strip: x86_64-linux-gnu-strip
+#            qemu: i386
+#          - build: stable-aarch64
+#            os: ubuntu-latest
+#            rust: stable
+#            target: aarch64-unknown-linux-gnu
+#            strip: aarch64-linux-gnu-strip
+#            qemu: qemu-aarch64
+#          - build: stable-arm-gnueabihf
+#            os: ubuntu-latest
+#            rust: stable
+#            target: armv7-unknown-linux-gnueabihf
+#            strip: arm-linux-gnueabihf-strip
+#            qemu: qemu-arm
+#          - build: stable-arm-musleabihf
+#            os: ubuntu-latest
+#            rust: stable
+#            target: armv7-unknown-linux-musleabihf
+#            strip: arm-linux-musleabihf-strip
+#            qemu: qemu-arm
+#          - build: stable-arm-musleabi
+#            os: ubuntu-latest
+#            rust: stable
+#            target: armv7-unknown-linux-musleabi
+#            strip: arm-linux-musleabi-strip
+#            qemu: qemu-arm
+#          - build: stable-powerpc64
+#            os: ubuntu-latest
+#            rust: stable
+#            target: powerpc64-unknown-linux-gnu
+#            strip: powerpc64-linux-gnu-strip
+#            qemu: qemu-ppc64
+#          - build: stable-s390x
+#            os: ubuntu-latest
+#            rust: stable
+#            target: s390x-unknown-linux-gnu
+#            strip: s390x-linux-gnu-strip
+#            qemu: qemu-s390x
+#          - build: macos
+#            os: macos-latest
+#            rust: nightly
+#            target: x86_64-apple-darwin
+#          - build: win-msvc
+#            os: windows-latest
+#            rust: nightly
+#            target: x86_64-pc-windows-msvc
+#          - build: win-gnu
+#            os: windows-latest
+#            rust: nightly-x86_64-gnu
+#            target: x86_64-pc-windows-gnu
+#          - build: win32-msvc
+#            os: windows-latest
+#            rust: nightly
+#            target: i686-pc-windows-msvc
 
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v4
 
-      - name: Install packages (Ubuntu)
-        if: matrix.os == 'ubuntu-latest'
-        shell: bash
-        run: |
-          ci/ubuntu-install-packages
-
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
 
-      - name: Use Cross
-        if: matrix.os == 'ubuntu-latest' && matrix.target != ''
-        shell: bash
-        run: |
-          # In the past, new releases of 'cross' have broken CI. So for now, we
-          # pin it. We also use their pre-compiled binary releases because cross
-          # has over 100 dependencies and takes a bit to compile.
-          dir="$RUNNER_TEMP/cross-download"
-          mkdir "$dir"
-          echo "$dir" >> $GITHUB_PATH
-          cd "$dir"
-          curl -LO "https://github.com/cross-rs/cross/releases/download/$CROSS_VERSION/cross-x86_64-unknown-linux-musl.tar.gz"
-          tar xf cross-x86_64-unknown-linux-musl.tar.gz
-          echo "CARGO=cross" >> $GITHUB_ENV
-
-      - name: Set target variables
-        shell: bash
-        run: |
-          echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
-          echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
-
-      - name: Show command used for Cargo
-        shell: bash
-        run: |
-          echo "cargo command is: ${{ env.CARGO }}"
-          echo "target flag is: ${{ env.TARGET_FLAGS }}"
-          echo "target dir is: ${{ env.TARGET_DIR }}"
+      - uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --verbose --release --locked --target ${{ matrix.target }}
 
-      - name: Build release binary
+      - name: Set the release env variables
         shell: bash
         run: |
-          ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }}
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
             bin="target/${{ matrix.target }}/release/afrim-wish.exe"
           else
             bin="target/${{ matrix.target }}/release/afrim-wish"
           fi
           echo "BIN=$bin" >> $GITHUB_ENV
 
-      - name: Strip release binary (macos)
-        if: matrix.os == 'macos-latest'
+      - name: Strip release binary
         shell: bash
         run: strip "$BIN"
 
-      - name: Strip release binary (cross)
-        if: env.CARGO == 'cross'
-        shell: bash
-        run: |
-          docker run --rm -v \
-            "$PWD/target:/target:Z" \
-            "ghcr.io/cross-rs/${{ matrix.target }}:main" \
-            "${{ matrix.strip }}" \
-            "/$BIN"
-
       - name: Determine archive name
         shell: bash
         run: |
@@ -208,10 +168,22 @@ jobs:
       - name: Creating directory for archive
         shell: bash
         run: |
-          mkdir -p "$ARCHIVE"/{complete,doc}
+          mkdir -p "$ARCHIVE"
           cp "$BIN" "$ARCHIVE"/
-          cp {README.md,LICENSE,demo.gif} "$ARCHIVE"/
-          cp {CHANGELOG.md} "$ARCHIVE"/doc/
+          cp {README.md,LICENSE,demo.gif,CHANGELOG.md} "$ARCHIVE"/
+
+      - uses: actions/checkout@v4
+        with:
+          repository: pythonbrad/afrim-man
+          fetch-depth: 1
+          path: afrim-man
+
+      - name: Build and Add documentation
+        shell: bash
+        run: |
+          ${{ env.CARGO }} install mdbook
+          mdbook build afrim-man
+          cp -r afrim-man/book "$ARCHIVE"/
 
       - name: Build archive (Windows)
         shell: bash
@@ -238,76 +210,3 @@ jobs:
         run: |
           version="${{ needs.create-release.outputs.version }}"
           gh release upload "$version" ${{ env.ASSET }} ${{ env.ASSET_SUM }}
-
-  build-release-deb:
-    name: build-release-deb
-    needs: ["create-release"]
-    runs-on: ubuntu-latest
-    env:
-      TARGET: x86_64-unknown-linux-musl
-      # Emit backtraces on panics.
-      RUST_BACKTRACE: 1
-
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-
-      - name: Install packages (Ubuntu)
-        shell: bash
-        run: |
-          ci/ubuntu-install-packages
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly
-          target: ${{ env.TARGET }}
-
-      - name: Install cargo-deb
-        shell: bash
-        run: |
-          cargo install cargo-deb
-
-      # 'cargo deb' does not seem to provide a way to specify an asset that is
-      # created at build time, such as afrim-wish's man page. To work around this,
-      # we force a debug build, copy out the man page (and shell completions)
-      # produced from that build, put it into a predictable location and then
-      # build the deb, which knows where to look.
-      - name: Build debug binary to create release assets
-        shell: bash
-        run: |
-          cargo build --target ${{ env.TARGET }}
-          bin="target/${{ env.TARGET }}/debug/afrim-wish"
-          echo "BIN=$bin" >> $GITHUB_ENV
-
-      - name: Create deployment directory
-        shell: bash
-        run: |
-          dir=deployment/deb
-          mkdir -p "$dir"
-          echo "DEPLOY_DIR=$dir" >> $GITHUB_ENV
-
-      - name: Build release binary
-        shell: bash
-        run: |
-          cargo deb --profile deb --target ${{ env.TARGET }}
-          version="${{ needs.create-release.outputs.version }}"
-          echo "DEB_DIR=target/${{ env.TARGET }}/debian" >> $GITHUB_ENV
-          echo "DEB_NAME=afrim-wish-$version-1-amd64.deb" >> $GITHUB_ENV
-
-      - name: Create sha256 sum of deb file
-        shell: bash
-        run: |
-          cd "$DEB_DIR"
-          sum="$DEB_NAME.sha256"
-          shasum -a 256 "$DEB_NAME" > "$sum"
-          echo "SUM=$sum" >> $GITHUB_ENV
-
-      - name: Upload release archive
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          cd "$DEB_DIR"
-          version="${{ needs.create-release.outputs.version }}"
-          gh release upload "$version" "$DEB_NAME" "$SUM"
diff --git a/Cross.toml b/Cross.toml
@@ -0,0 +1,6 @@
+[build]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH", 
+    "apt-get update && apt-get install -y xorg-dev libxtst-dev libevdev-dev libxdo-dev xdo xdotool pkg-config"
+]
+env = { passthrough = ["PKG_CONFIG_ALLOW_CROSS=1"] }
diff --git a/ci/ubuntu-install-packages b/ci/ubuntu-install-packages
