mirror of
https://github.com/ClementTsang/bottom.git
synced 2026-05-03 21:40:32 +00:00
ci: follow .deb naming conventions (#969)
Change the .deb file generation back to following standard naming conventions.
This commit is contained in:
@@ -343,6 +343,7 @@ jobs:
|
||||
uses: ClementTsang/cargo-action@v0.0.3
|
||||
env:
|
||||
BTM_GENERATE: true
|
||||
BTM_BUILD_RELEASE_CALLER: ${{ inputs.caller }}
|
||||
with:
|
||||
command: build
|
||||
args: --release --locked --verbose --features deploy --target ${{ matrix.info.target }}
|
||||
@@ -359,14 +360,29 @@ jobs:
|
||||
run: |
|
||||
gzip ./manpage/btm.1
|
||||
|
||||
- name: Prepare custom version if needed
|
||||
if: ${{ inputs.caller == 'nightly' }}
|
||||
id: custom-version
|
||||
run: |
|
||||
if [[ ${{ matrix.info.cross }} == false ]]; then
|
||||
# x86-64 can be directly executed, so we can do the easy way out.
|
||||
VERSION=$(./target/${{ matrix.info.target }}/release/btm -V | awk '{print $2}')
|
||||
echo "CUSTOM_VERSION_ARG='--deb-version=$VERSION'" >> $GITHUB_OUTPUT
|
||||
else
|
||||
VER=$(grep -m1 "^version" Cargo.toml | awk '{print $3}' | tr -d \") # NB: Assumes the first instance of version is the build version
|
||||
APPEND=nightly-${GITHUB_SHA::8}
|
||||
echo "CUSTOM_VERSION_ARG='--deb-version=$VER-$APPEND'" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Build Debian release (x86-64)
|
||||
if: matrix.info.cross == false
|
||||
env:
|
||||
BTM_GENERATE: true
|
||||
run: |
|
||||
cargo install cargo-deb --version 1.41.1 --locked
|
||||
cargo deb --no-build --target ${{ matrix.info.target }}
|
||||
cp ./target/${{ matrix.info.target }}/debian/bottom_*.deb ./bottom_${{ matrix.info.target }}.deb
|
||||
cargo install cargo-deb --version 1.41.3 --locked
|
||||
VERSION_ARG=$(echo ${{ steps.custom-version.outputs.CUSTOM_VERSION_ARG }} | tr -d \')
|
||||
cargo deb --no-build --target ${{ matrix.info.target }} $VERSION_ARG
|
||||
cp ./target/${{ matrix.info.target }}/debian/bottom_*.deb .
|
||||
|
||||
- name: Build Debian release (ARM)
|
||||
if: matrix.info.cross == true
|
||||
@@ -374,13 +390,20 @@ jobs:
|
||||
BTM_GENERATE: true
|
||||
run: |
|
||||
docker pull ${{ matrix.info.container }}
|
||||
docker run -t --rm --mount type=bind,source="$(pwd)",target=/volume ${{ matrix.info.container }} "--variant ${{ matrix.info.dpkg }} --target ${{ matrix.info.target }} --no-build" "/volume"
|
||||
cp ./target/${{ matrix.info.target }}/debian/bottom-*.deb ./bottom_${{ matrix.info.target }}.deb
|
||||
VERSION_ARG=$(echo ${{ steps.custom-version.outputs.CUSTOM_VERSION_ARG }} | tr -d \')
|
||||
docker run -t --rm --mount type=bind,source="$(pwd)",target=/volume ${{ matrix.info.container }} "--no-build --variant ${{ matrix.info.dpkg }} --target ${{ matrix.info.target }} $VERSION_ARG" "/volume"
|
||||
cp ./target/${{ matrix.info.target }}/debian/bottom-*.deb .
|
||||
TMP_NAME=$(find bottom-*.deb)
|
||||
VERSION=${{ matrix.info.dpkg }}
|
||||
mv $TMP_NAME $(echo $TMP_NAME | sed "s/-$VERSION//")
|
||||
|
||||
- name: Test Debian release
|
||||
- name: Verify Debian release
|
||||
id: verify
|
||||
run: |
|
||||
dpkg -I ./bottom_${{ matrix.info.target }}.deb
|
||||
dpkg -I ./bottom_${{ matrix.info.target }}.deb | grep ${{ matrix.info.dpkg }} && echo "Found correct architecture"
|
||||
DEB_FILE=$(find bottom_*.deb)
|
||||
dpkg -I $DEB_FILE
|
||||
dpkg -I $DEB_FILE | grep ${{ matrix.info.dpkg }} && echo "Found correct architecture"
|
||||
echo "DEB_FILE=$DEB_FILE" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Delete generated Debian folder
|
||||
run: |
|
||||
@@ -391,7 +414,7 @@ jobs:
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir release
|
||||
mv bottom_${{ matrix.info.target }}.deb release/
|
||||
mv ${{ steps.verify.outputs.DEB_FILE }} release/
|
||||
|
||||
- name: Save release as artifact
|
||||
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
|
||||
|
||||
Reference in New Issue
Block a user