Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.1.2 #77

Merged
merged 6 commits into from
Oct 6, 2021
Merged

Release v1.1.2 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a282cd
Add xz-utils package to support unix packaging
lucor Oct 5, 2021
9b7f52a
Unsupported target operating system "linux/amd64"
lucor Oct 5, 2021
b02e418
Merge pull request #76 from lucor/base-image-xz-utils
lucor Oct 5, 2021
eb3907e
Merge pull request #75 from lucor/fixes/linux-target
lucor Oct 5, 2021
8daaf97
Release v1.1.2
lucor Oct 5, 2021
8f06004
Fix unix package extension is now tar.xz
lucor Oct 5, 2021
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog - Fyne.io fyne-cross

## 1.1.2 - 05 Oct 2021

### Fixed

- Unsupported target operating system "linux/amd64" #74

## 1.1.1 - 29 Sep 2021

### Added
Expand Down
3 changes: 3 additions & 0 deletions docker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ above.

Example: `fyneio/fyne-cross:1.1-base-21.03.17`

## Release 21.10.05
- Add xz-utils package to support unix packaging fyne-io/fyne#1919

## Release 21.09.29
- Update Go to v1.16.8
- Update fyne CLI to v2.1.0
Expand Down
2 changes: 2 additions & 0 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ RUN apt-get update -qq \
gosu \
zip \
unzip \
# Switch from gz to xz compression for unix packages fyne-io/fyne#1919
xz-utils \
# fyne deps
libgl1-mesa-dev \
libegl1-mesa-dev \
Expand Down
9 changes: 7 additions & 2 deletions internal/command/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func fynePackage(ctx Context) error {
}

target := ctx.OS
if ctx.Architecture != ArchMultiple {
if ctx.OS == androidOS && ctx.Architecture != ArchMultiple {
target += "/" + ctx.Architecture.String()
}

Expand Down Expand Up @@ -253,9 +253,14 @@ func fyneRelease(ctx Context) error {
}
}

target := ctx.OS
if ctx.OS == androidOS && ctx.Architecture != ArchMultiple {
target += "/" + ctx.Architecture.String()
}

args := []string{
fyneBin, "release",
"-os", ctx.OS,
"-os", target,
"-name", ctx.Name,
"-icon", volume.JoinPathContainer(ctx.TmpDirContainer(), ctx.ID, icon.Default),
"-appBuild", ctx.AppBuild,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (cmd *FreeBSD) Run() error {
//
log.Info("[i] Packaging app...")

packageName := fmt.Sprintf("%s.tar.gz", ctx.Name)
packageName := fmt.Sprintf("%s.tar.xz", ctx.Name)

err = prepareIcon(ctx)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (cmd *Linux) Run() error {
//
log.Info("[i] Packaging app...")

packageName := fmt.Sprintf("%s.tar.gz", ctx.Name)
packageName := fmt.Sprintf("%s.tar.xz", ctx.Name)

err = prepareIcon(ctx)
if err != nil {
Expand Down