Skip to content

Commit 69440c4

Browse files
moubctezmoubctez
committed
Fix FreeBSD + version
1 parent 4988e43 commit 69440c4

1 file changed

Lines changed: 31 additions & 19 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,20 @@ jobs:
5353
upload_url: ${{ steps.release.outputs.upload_url }}
5454
steps:
5555
- name: Create GitHub release
56-
uses: softprops/action-gh-release@v3
56+
uses: shogo82148/actions-create-release@v1
5757
if: github.ref_type == 'tag'
5858
with:
5959
draft: true
6060
generate_release_notes: true
6161

62+
# For testing
6263
- name: Create test GitHub release
63-
uses: softprops/action-gh-release@v3
64+
uses: shogo82148/actions-create-release@v1
6465
if: github.ref_type != 'tag'
6566
with:
6667
draft: true
67-
name: test
68+
overwrite: true
69+
tag_name: test
6870

6971
create-sbom:
7072
needs:
@@ -122,33 +124,33 @@ jobs:
122124
- name: Build Linux x86_64 binary
123125
run: |
124126
cargo build --locked --release --target x86_64-unknown-linux-gnu
125-
mv target/x86_64-unknown-linux-gnu/release/defguard-proxy defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu
126-
tar -zcf defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu.tar.gz \
127-
defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu
127+
mv target/x86_64-unknown-linux-gnu/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu
128+
tar -zcf defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz \
129+
defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu
128130
129131
- name: Build Linux aarch64 binary
130132
env:
131133
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
132134
PKG_CONFIG_SYSROOT_DIR: /usr/lib/aarch64-linux-gnu
133135
run: |
134136
cargo build --locked --release --target aarch64-unknown-linux-gnu
135-
mv target/aarch64-unknown-linux-gnu/release/defguard-proxy defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu
136-
tar -zcf defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu.tar.gz \
137-
defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu
137+
mv target/aarch64-unknown-linux-gnu/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu
138+
tar -zcf defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz \
139+
defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu
138140
139141
- name: Build FreeBSD binary
140142
run: |
141143
rsync -rlptxzH -e 'ssh -l root' --del ./ freebsd:work/
142144
ssh root@freebsd 'cd work && cargo build --locked --release'
143-
scp root@freebsd:work/target/release/defguard-proxy defguard-proxy-${{ github.ref_name }}-x86_64-unknown-freebsd
144-
tar -zcf defguard-proxy-${{ github.ref_name }}-x86_64-unknown-freebsd.tar.gz \
145-
defguard-proxy-${{ github.ref_name }}-x86_64-unknown-freebsd
145+
scp root@freebsd:work/target/release/defguard-proxy defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
146+
tar -zcf defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd.tar.gz \
147+
defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd
146148
147149
- name: Build x86_64 DEB package
148150
uses: defGuard/fpm-action@main
149151
with:
150152
fpm_args:
151-
"defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
153+
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
152154
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
153155
example-config.toml=/etc/defguard/proxy.toml"
154156
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb"
@@ -157,7 +159,7 @@ jobs:
157159
uses: defGuard/fpm-action@main
158160
with:
159161
fpm_args:
160-
"defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
162+
"defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
161163
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
162164
example-config.toml=/etc/defguard/proxy.toml"
163165
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb"
@@ -166,7 +168,7 @@ jobs:
166168
uses: defGuard/fpm-action@main
167169
with:
168170
fpm_args:
169-
"defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
171+
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
170172
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
171173
example-config.toml=/etc/defguard/proxy.toml"
172174
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm"
@@ -175,7 +177,7 @@ jobs:
175177
uses: defGuard/fpm-action@main
176178
with:
177179
fpm_args:
178-
"defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
180+
"defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
179181
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
180182
example-config.toml=/etc/defguard/proxy.toml"
181183
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-freebsd.rpm"
@@ -184,7 +186,7 @@ jobs:
184186
uses: defGuard/fpm-action@main
185187
with:
186188
fpm_args:
187-
"defguard-${{ github.ref_name }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy
189+
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy
188190
defguard-proxy.service.freebsd=/usr/local/etc/rc.d/defguard-proxy
189191
example-config.toml=/etc/defguard/proxy.toml"
190192
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
@@ -195,7 +197,7 @@ jobs:
195197
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
196198
with:
197199
upload_url: ${{ needs.create-release.outputs.upload_url }}
198-
asset_path: defguard-proxy-${{ github.ref_name }}-x86_64-unknown-linux-gnu.tar.gz
200+
asset_path: defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
199201
asset_content_type: application/gzip
200202
overwrite: true
201203

@@ -205,7 +207,17 @@ jobs:
205207
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
206208
with:
207209
upload_url: ${{ needs.create-release.outputs.upload_url }}
208-
asset_path: defguard-proxy-${{ github.ref_name }}-aarch64-unknown-linux-gnu.tar.gz
210+
asset_path: defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz
211+
asset_content_type: application/gzip
212+
overwrite: true
213+
214+
- name: Upload FreeBSD x86_64 archive
215+
uses: shogo82148/actions-upload-release-asset@v1
216+
env:
217+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
218+
with:
219+
upload_url: ${{ needs.create-release.outputs.upload_url }}
220+
asset_path: defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd.tar.gz
209221
asset_content_type: application/gzip
210222
overwrite: true
211223

0 commit comments

Comments
 (0)