Skip to content

Commit a4fc65f

Browse files
moubctezmoubctez
committed
Fix DEB build
1 parent 8b54ac9 commit a4fc65f

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Build app and create release'
1+
name: "Build app and create release"
22
on:
33
push:
44
tags:
@@ -56,14 +56,14 @@ jobs:
5656
git config --global --add safe.directory '*'
5757
- uses: actions/checkout@v5
5858
with:
59-
submodules: 'recursive'
59+
submodules: "recursive"
6060
- uses: pnpm/action-setup@v4
6161
with:
6262
version: 10.17
6363
run_install: false
6464
- uses: actions/setup-node@v5
6565
with:
66-
node-version: '24'
66+
node-version: "24"
6767
- name: Get pnpm store directory
6868
run: |
6969
echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
@@ -90,23 +90,23 @@ jobs:
9090
env:
9191
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9292
with:
93-
args: '--bundles deb'
93+
args: "--bundles deb"
9494
- name: Upload DEB
9595
uses: actions/upload-release-asset@v1
9696
env:
9797
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9898
with:
9999
upload_url: ${{ needs.create-release.outputs.upload_url }}
100-
asset_path: src-tauri/target/release/bundle/deb/Defguard_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
101-
asset_name: Defguard_${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
100+
asset_path: src-tauri/target/release/bundle/deb/defguard-client_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
101+
asset_name: defguard-client${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
102102
asset_content_type: application/octet-stream
103103
- name: Rename dg binary
104104
run: mv src-tauri/target/release/dg dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}
105105
- name: Build dg deb
106106
uses: defGuard/fpm-action@main
107107
with:
108-
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'
109-
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'
108+
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"
109+
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"
110110
- name: Upload DEB
111111
uses: actions/upload-release-asset@v1.0.2
112112
env:
@@ -126,7 +126,7 @@ jobs:
126126
run: |
127127
COMPONENT=$([[ "${{ github.ref_name }}" == *"-"* ]] && echo "pre-release" || echo "release") # if tag contain "-" assume it's pre-release.
128128
129-
deb-s3 upload -l --bucket=apt.defguard.net --access-key-id=${{ secrets.AWS_ACCESS_KEY_APT }} --secret-access-key=${{ secrets.AWS_SECRET_KEY_APT }} --s3-region=eu-north-1 --no-fail-if-exists --codename=bookworm --component="$COMPONENT" src-tauri/target/release/bundle/deb/Defguard_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
129+
deb-s3 upload -l --bucket=apt.defguard.net --access-key-id=${{ secrets.AWS_ACCESS_KEY_APT }} --secret-access-key=${{ secrets.AWS_SECRET_KEY_APT }} --s3-region=eu-north-1 --no-fail-if-exists --codename=bookworm --component="$COMPONENT" src-tauri/target/release/bundle/deb/defguard-client_${{ env.VERSION }}_${{ matrix.deb_arch }}.deb
130130
deb-s3 upload -l --bucket=apt.defguard.net --access-key-id=${{ secrets.AWS_ACCESS_KEY_APT }} --secret-access-key=${{ secrets.AWS_SECRET_KEY_APT }} --s3-region=eu-north-1 --no-fail-if-exists --codename=bookworm --component="$COMPONENT" dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb
131131
132132
build-linux:
@@ -152,15 +152,15 @@ jobs:
152152
steps:
153153
- uses: actions/checkout@v5
154154
with:
155-
submodules: 'recursive'
155+
submodules: "recursive"
156156
- name: Write release version
157157
run: |
158158
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
159159
echo Version: $VERSION
160160
echo "VERSION=$VERSION" >> ${GITHUB_ENV}
161161
- uses: actions/setup-node@v5
162162
with:
163-
node-version: '24'
163+
node-version: "24"
164164
- uses: pnpm/action-setup@v4
165165
with:
166166
version: 10.17
@@ -188,7 +188,7 @@ jobs:
188188
env:
189189
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
190190
with:
191-
args: '--bundles deb,rpm'
191+
args: "--bundles deb,rpm"
192192
- name: Calculate DEB SHA256
193193
id: calculate-sha256
194194
if: matrix.deb_arch == 'amd64'
@@ -284,8 +284,8 @@ jobs:
284284
- name: Build dg deb
285285
uses: defGuard/fpm-action@main
286286
with:
287-
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'
288-
fpm_opts: '--architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.deb'
287+
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"
288+
fpm_opts: "--architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.deb"
289289
- name: Upload DEB
290290
uses: actions/upload-release-asset@v1.0.2
291291
env:
@@ -298,8 +298,8 @@ jobs:
298298
- name: Build dg rpm
299299
uses: defGuard/fpm-action@main
300300
with:
301-
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'
302-
fpm_opts: '--architecture ${{ matrix.binary_arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.rpm'
301+
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"
302+
fpm_opts: "--architecture ${{ matrix.binary_arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.rpm"
303303
- name: Upload RPM
304304
uses: actions/upload-release-asset@v1.0.2
305305
env:
@@ -421,15 +421,15 @@ jobs:
421421
steps:
422422
- uses: actions/checkout@v5
423423
with:
424-
submodules: 'recursive'
424+
submodules: "recursive"
425425
- name: Write release version
426426
run: |
427427
$env:VERSION=echo ($env:GITHUB_REF_NAME.Substring(1) -Split "-")[0]
428428
echo Version: $env:VERSION
429429
echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
430430
- uses: actions/setup-node@v6
431431
with:
432-
node-version: '24'
432+
node-version: "24"
433433
- uses: pnpm/action-setup@v4
434434
with:
435435
version: 10

0 commit comments

Comments
 (0)