9898 # Change to '--frozen-lockfile' once this gets fixed:
9999 # https://github.com/pnpm/action-setup/issues/40
100100 - name : Build frontend
101- run : pnpm install --ignore-scripts --no-frozen-lockfile && pnpm build
102101 working-directory : web
102+ run : |
103+ pnpm install --ignore-scripts --no-frozen-lockfile
104+ pnpm build
103105
104106 - name : Install Rust stable
105107 uses : dtolnay/rust-toolchain@stable
@@ -128,9 +130,9 @@ jobs:
128130
129131 - name : Build FreeBSD binary
130132 run : |
131- rsync -rlptxzH -e 'ssh -l root' --del ./ freebsd:work/
132- ssh root@freebsd 'cd work && cargo build --locked --release'
133- scp root@freebsd:work/target/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
133+ rsync -rlptxzH -e 'ssh -l root' --del ./ freebsd:work/edge/
134+ ssh root@freebsd 'cd work/edge && cargo build --locked --release'
135+ scp root@freebsd:work/edge/ target/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
134136 tar -zcf defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd.tar.gz \
135137 defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
136138
@@ -168,7 +170,7 @@ jobs:
168170 " defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
169171 defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
170172 example-config.toml=/etc/defguard/proxy.toml"
171- fpm_opts : " --architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-freebsd .rpm"
173+ fpm_opts : " --architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu .rpm"
172174
173175 - name : Build FreeBSD package
174176 uses : defGuard/fpm-action@main
@@ -177,7 +179,7 @@ jobs:
177179 " defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy
178180 defguard-proxy.service.freebsd=/usr/local/etc/rc.d/defguard-proxy
179181 example-config.toml=/etc/defguard/proxy.toml"
180- fpm_opts : " --architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
182+ fpm_opts : " --architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-proxy- ${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
181183
182184 - name : Upload Linux x86_64 archive
183185 uses : shogo82148/actions-upload-release-asset@v1
@@ -255,6 +257,6 @@ jobs:
255257 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
256258 with :
257259 upload_url : ${{ needs.create-release.outputs.upload_url }}
258- asset_path : defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg
260+ asset_path : defguard-proxy- ${{ env.VERSION }}_x86_64-unknown-freebsd.pkg
259261 asset_content_type : application/x-pkg
260262 overwrite : true
0 commit comments