1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-11-09 20:00:12 +00:00

build: e2ee as separate build

Forgot that E2EE adds the libolm dependency, which is fine for the
package manager versions (where it is now marked a a dep) and docker, but not the
best for binary distributions. As a result, Linux versions with and
without E2EE are now distributed, the former now including "MatrixE2EE"
in its filename.
This commit is contained in:
Harvey Tindall 2024-08-11 18:53:00 +01:00
parent ab3989f233
commit 48be756e48
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2

View File

@ -18,6 +18,7 @@ builds:
ldflags: ldflags:
- -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" - -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater={{.Env.JFA_GO_UPDATER}} {{.Env.JFA_GO_STRIP}} -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}"
goos: goos:
- linux
- darwin - darwin
- windows - windows
goarch: goarch:
@ -95,7 +96,6 @@ archives:
- id: notray - id: notray
builds: builds:
- notray - notray
- notray-e2ee
format: zip format: zip
name_template: >- name_template: >-
{{ .ProjectName }}_{{ .Version }}_ {{ .ProjectName }}_{{ .Version }}_
@ -103,6 +103,16 @@ archives:
{{- else }}{{- title .Os }}{{ end }}_ {{- else }}{{- title .Os }}{{ end }}_
{{- if eq .Arch "amd64" }}x86_64 {{- if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }} {{- else }}{{ .Arch }}{{ end }}
- id: notray-e2ee
builds:
- notray-e2ee
format: zip
name_template: >-
{{ .ProjectName }}_{{ .Version }}_MatrixE2EE_
{{- if eq .Os "darwin" }}macOS
{{- else }}{{- title .Os }}{{ end }}_
{{- if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }}
checksum: checksum:
name_template: 'checksums.txt' name_template: 'checksums.txt'
snapshot: snapshot:
@ -132,6 +142,16 @@ nfpms:
- apk - apk
- deb - deb
- rpm - rpm
overrides:
deb:
dependencies:
- libolm-dev
rpm:
dependencies:
- libolm
apk:
dependencies:
- olm
- id: tray - id: tray
file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_TrayIcon_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}' file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_TrayIcon_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}'
package_name: jfa-go-tray package_name: jfa-go-tray
@ -158,9 +178,12 @@ nfpms:
- jfa-go - jfa-go
dependencies: dependencies:
- libayatana-appindicator - libayatana-appindicator
- libolm-dev
rpm: rpm:
dependencies: dependencies:
- libappindicator-gtk3 - libappindicator-gtk3
- libolm
apk: apk:
dependencies: dependencies:
- libayatana-appindicator - libayatana-appindicator
- olm