From f1171e2fb200ace7f43a25fe56e6aae402b2a487 Mon Sep 17 00:00:00 2001 From: Skgland Date: Sun, 17 Aug 2025 19:19:47 +0200 Subject: [PATCH 1/4] build debian packages on linux targets --- .github/workflows/ci.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0845fd5..85593c89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,11 +87,22 @@ jobs: run: | cargo rustc --target ${{ matrix.target }} ${{ matrix.args }} --verbose --bin scryer-prolog --release echo "$PWD/target/release" >> $GITHUB_PATH + + - name: Install cargo-deb for creating debian packages + if: ${{ matrix.publish && contains(matrix.target, 'linux') }} + run: cargo install cargo-deb --force --locked + + - name: Build release debian packages + if: ${{ matrix.publish && contains(matrix.target, 'linux') }} + run: cargo deb + - name: Publish release binary artifact if: matrix.publish uses: actions/upload-artifact@v4 with: - path: target/${{ matrix.target }}/release/scryer-prolog* + path: | + target/${{ matrix.target }}/release/scryer-prolog* + target/${{ matrix.target }}/release/debian/scryer-prolog*.deb name: scryer-prolog_${{ matrix.os }}_${{ matrix.target }} logtalk-test: @@ -199,17 +210,17 @@ jobs: - uses: actions/download-artifact@v4 - name: Zip binaries for release run: | - zip scryer-prolog_macos-11.zip ./scryer-prolog_macos-11_x86_64-apple-darwin/scryer-prolog - zip scryer-prolog_ubuntu-20.04.zip ./scryer-prolog_ubuntu-20.04_x86_64-unknown-linux-gnu/scryer-prolog - zip scryer-prolog_ubuntu-22.04.zip ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/scryer-prolog + zip scryer-prolog_macos-latest.zip ./scryer-prolog_macos-latest_x86_64-apple-darwin/scryer-prolog + zip scryer-prolog_ubuntu-22.04_i686.zip ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/scryer-prolog ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/debian/scryer-prolog*.deb + zip scryer-prolog_ubuntu-22.04_x86_64.zip ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/scryer-prolog ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/debian/scryer-prolog*.deb zip scryer-prolog_windows-latest.zip ./scryer-prolog_windows-latest_x86_64-pc-windows-msvc/scryer-prolog.exe zip scryer-prolog_wasm32.zip ./scryer-prolog_ubuntu-22.04_wasm32-unknown-unknown/scryer-prolog.wasm - name: Release uses: softprops/action-gh-release@v2 with: files: | - scryer-prolog_macos-11.zip - scryer-prolog_ubuntu-20.04.zip - scryer-prolog_ubuntu-22.04.zip + scryer-prolog_macos-latest.zip + scryer-prolog_ubuntu-22.04_i686.zip + scryer-prolog_ubuntu-22.04_x86_64.zip scryer-prolog_windows-latest.zip scryer-prolog_wasm32.zip From 52f3ddd20d5dbc5e8cc11338c02ddd80552dd534 Mon Sep 17 00:00:00 2001 From: Skgland Date: Sun, 17 Aug 2025 22:12:54 +0200 Subject: [PATCH 2/4] fix paths --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85593c89..c3705cf9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: with: path: | target/${{ matrix.target }}/release/scryer-prolog* - target/${{ matrix.target }}/release/debian/scryer-prolog*.deb + target/${{ matrix.target }}/debian/scryer-prolog*.deb name: scryer-prolog_${{ matrix.os }}_${{ matrix.target }} logtalk-test: @@ -211,8 +211,8 @@ jobs: - name: Zip binaries for release run: | zip scryer-prolog_macos-latest.zip ./scryer-prolog_macos-latest_x86_64-apple-darwin/scryer-prolog - zip scryer-prolog_ubuntu-22.04_i686.zip ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/scryer-prolog ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/debian/scryer-prolog*.deb - zip scryer-prolog_ubuntu-22.04_x86_64.zip ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/scryer-prolog ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/debian/scryer-prolog*.deb + zip scryer-prolog_ubuntu-22.04_i686.zip ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/release/scryer-prolog ./scryer-prolog_ubuntu-22.04_i686-unknown-linux-gnu/debian/scryer-prolog*.deb + zip scryer-prolog_ubuntu-22.04_x86_64.zip ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/release/scryer-prolog ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/debian/scryer-prolog*.deb zip scryer-prolog_windows-latest.zip ./scryer-prolog_windows-latest_x86_64-pc-windows-msvc/scryer-prolog.exe zip scryer-prolog_wasm32.zip ./scryer-prolog_ubuntu-22.04_wasm32-unknown-unknown/scryer-prolog.wasm - name: Release From 3aa272e44de7d26e1316802d2639df937de33379 Mon Sep 17 00:00:00 2001 From: Skgland Date: Sun, 17 Aug 2025 22:31:28 +0200 Subject: [PATCH 3/4] explicitly pass the target to cargo-deb --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3705cf9..c9179fcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: - name: Build release debian packages if: ${{ matrix.publish && contains(matrix.target, 'linux') }} - run: cargo deb + run: cargo deb --target ${{ matrix.target }} - name: Publish release binary artifact if: matrix.publish From 6338a40eed1517d813bce6ecb1b4866ea218651f Mon Sep 17 00:00:00 2001 From: Skgland Date: Sun, 17 Aug 2025 22:52:45 +0200 Subject: [PATCH 4/4] fixup logtalk-test --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9179fcb..36a0f15e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,8 +115,8 @@ jobs: with: name: scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu - run: | - chmod +x scryer-prolog - echo "$PWD" >> "$GITHUB_PATH" + chmod +x release/scryer-prolog + echo "$PWD/release" >> "$GITHUB_PATH" - name: Install Logtalk uses: logtalk-actions/setup-logtalk@master with: