Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ jobs:
# Change to '--frozen-lockfile' once this gets fixed:
# https://github.com/pnpm/action-setup/issues/40
- name: Build frontend
run: pnpm install --ignore-scripts --no-frozen-lockfile && pnpm build
working-directory: web
run: |
pnpm install --ignore-scripts --no-frozen-lockfile
pnpm build

- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -128,9 +130,9 @@ jobs:

- name: Build FreeBSD binary
run: |
rsync -rlptxzH -e 'ssh -l root' --del ./ freebsd:work/
ssh root@freebsd 'cd work && cargo build --locked --release'
scp root@freebsd:work/target/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
rsync -rlptxzH -e 'ssh -l root' --del ./ freebsd:work/edge/
ssh root@freebsd 'cd work/edge && cargo build --locked --release'
scp root@freebsd:work/edge/target/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
tar -zcf defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd.tar.gz \
defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd

Expand Down Expand Up @@ -168,7 +170,7 @@ jobs:
"defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
example-config.toml=/etc/defguard/proxy.toml"
fpm_opts: "--architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-freebsd.rpm"
fpm_opts: "--architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.rpm"

- name: Build FreeBSD package
uses: defGuard/fpm-action@main
Expand All @@ -177,7 +179,7 @@ jobs:
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy
defguard-proxy.service.freebsd=/usr/local/etc/rc.d/defguard-proxy
example-config.toml=/etc/defguard/proxy.toml"
fpm_opts: "--architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
fpm_opts: "--architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
Comment thread
jakub-tldr marked this conversation as resolved.

- name: Upload Linux x86_64 archive
uses: shogo82148/actions-upload-release-asset@v1
Expand Down Expand Up @@ -255,6 +257,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg
asset_path: defguard-proxy-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg
Comment thread
jakub-tldr marked this conversation as resolved.
asset_content_type: application/x-pkg
overwrite: true
29 changes: 14 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading