Skip to content

Commit aa14ed5

Browse files
committed
Remove matrix
1 parent 6db7dd4 commit aa14ed5

2 files changed

Lines changed: 7 additions & 45 deletions

File tree

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
with:
5959
draft: true
6060
# TODO: remove
61-
# generate_release_notes: true
61+
generate_release_notes: true
6262
overwrite: true
63-
tag_name: test
63+
release_name: test
6464

6565
create-sbom:
6666
needs:
@@ -147,7 +147,7 @@ jobs:
147147
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
148148
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
149149
example-config.toml=/etc/defguard/proxy.toml"
150-
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb"
150+
fpm_opts: "--architecture amd64 --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb"
151151

152152
- name: Build aarch64 DEB package
153153
uses: defGuard/fpm-action@main
@@ -156,7 +156,7 @@ jobs:
156156
"defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
157157
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
158158
example-config.toml=/etc/defguard/proxy.toml"
159-
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb"
159+
fpm_opts: "--architecture arm64 --debug --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb"
160160

161161
- name: Build x86_64 RPM package
162162
uses: defGuard/fpm-action@main
@@ -165,7 +165,7 @@ jobs:
165165
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy
166166
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
167167
example-config.toml=/etc/defguard/proxy.toml"
168-
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm"
168+
fpm_opts: "--architecture amd64 --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm"
169169

170170
- name: Build aarch64 RPM package
171171
uses: defGuard/fpm-action@main
@@ -174,7 +174,7 @@ jobs:
174174
"defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy
175175
defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service
176176
example-config.toml=/etc/defguard/proxy.toml"
177-
fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-freebsd.rpm"
177+
fpm_opts: "--architecture arm64 --debug --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-freebsd.rpm"
178178

179179
- name: Build FreeBSD package
180180
uses: defGuard/fpm-action@main
@@ -183,7 +183,7 @@ jobs:
183183
"defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy
184184
defguard-proxy.service.freebsd=/usr/local/etc/rc.d/defguard-proxy
185185
example-config.toml=/etc/defguard/proxy.toml"
186-
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"
186+
fpm_opts: "--architecture amd64 --debug --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl"
187187

188188
- name: Upload Linux x86_64 archive
189189
uses: shogo82148/actions-upload-release-asset@v1

Cross.toml

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)