@@ -105,36 +105,27 @@ jobs:
105105 asset_name : Defguard_${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
106106 asset_content_type : application/octet-stream
107107 - name : Rename dg binary
108- run : mv src-tauri/target/release/dg dg-linux-${{ matrix.binary_arch }}- ${{ github.ref_name }}
108+ run : mv src-tauri/target/release/dg dg-linux-${{ env.VERSION }}_ ${{ matrix.deb_arch }}
109109 - name : Tar dg binary
110110 uses : a7ul/tar-action@v1.2.0
111111 with :
112112 command : c
113113 files : |
114- dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}
115- outPath : dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}_ubuntu-22-04-lts.tar.gz
116- - name : Upload dg archive
117- uses : actions/upload-release-asset@v1
118- env :
119- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
120- with :
121- upload_url : ${{ needs.create-release.outputs.upload_url }}
122- asset_path : dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}_ubuntu-22-04-lts.tar.gz
123- asset_name : dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}_ubuntu-22-04-lts.tar.gz
124- asset_content_type : application/octet-stream
114+ dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}
115+ outPath : dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.tar.gz
125116 - name : Build dg deb
126117 uses : defGuard/fpm-action@main
127118 with :
128- fpm_args : ' dg-linux-${{ matrix.binary_arch }}- ${{ github.ref_name }}=/usr/sbin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
129- fpm_opts : ' --architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}- ${{ github.ref_name }}_ubuntu-22-04-lts.deb'
119+ fpm_args : ' dg-linux-${{ env.VERSION }}_ ${{ matrix.deb_arch }}=/usr/sbin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
120+ fpm_opts : ' --architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ env.VERSION }}_ ${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb'
130121 - name : Upload DEB
131122 uses : actions/upload-release-asset@v1.0.2
132123 env :
133124 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
134125 with :
135126 upload_url : ${{ needs.create-release.outputs.upload_url }}
136- asset_path : dg-linux-${{ matrix.binary_arch }}- ${{ github.ref_name }}_ubuntu-22-04-lts.deb
137- asset_name : dg-linux-${{ matrix.binary_arch }}- ${{ github.ref_name }}_ubuntu-22-04-lts.deb
127+ asset_path : dg-linux-${{ env.VERSION }}_ ${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
128+ asset_name : dg-linux-${{ env.VERSION }}_ ${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
138129 asset_content_type : application/octet-stream
139130 # - name: Install ruby with deb-s3
140131 # if: matrix.build != 'freebsd'
0 commit comments