Merge pull request #120 from fyne-io/feature/kubernetes

Feature/kubernetes

.github/workflows/ci.yml

@@ -48,6 +48,28 @@ jobs:
 
     # Run tests
     - run: go test -v -cover -race ./...
+
+  k8s:
+    name: "Verify k8s build"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        # use max/min supported Go versions
+        go-version: ["1.18.x"]
+
+    steps:
+    - name: Setup Go environment
+      id: setup-go
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    # Checks-out the repository under $GITHUB_WORKSPACE
+    - uses: actions/checkout@v2
+
+    # Run tests
+    - run: go build -tags k8s
 
   build:
     name: "Build Calculator (${{ matrix.target.os }}, ${{ matrix.go-version }})"
@@ -66,9 +88,10 @@ jobs:
           - os: freebsd
           - os: android
             args: -app-id calc.${GITHUB_SHA}
-          - os: darwin
-            args: -app-id calc.${GITHUB_SHA}
-            host: macos-latest
+          ## Not shared darwin image is available at the moment
+          # - os: darwin
+          #  args: -app-id calc.${GITHUB_SHA}
+          #  host: macos-latest
           - os: web
 
           ## Currently not easily supported from GitHub actions.

.gitignore

@@ -1,3 +1,4 @@
 /fyne-cross
+/internal/cmd/fyne-cross-s3/fyne-cross-s3
 /*.dmg
 /*.xip

README.md

@@ -42,7 +42,14 @@ Supported targets are:
 
 For go >= 1.16:
 ```
-go install github.com/fyne-io/fyne-cross@latest
+git clone https://github.com/fyne-io/fyne-cross.git
+cd fyne-cross && go install
+```
+
+To install a fyne-cross with kubernetes engine:
+```
+git clone https://github.com/fyne-io/fyne-cross.git
+cd fyne-cross && go install -tags k8s
 ```
 
 For older go:

docker/base/Dockerfile

@@ -10,11 +10,18 @@ ARG FYNE_VERSION
 # Install the fyne CLI tool
 RUN go install -ldflags="-w -s" -v "fyne.io/fyne/v2/cmd/fyne@${FYNE_VERSION}"
 
+WORKDIR /src
+
+COPY / .
+WORKDIR /src/internal/cmd/fyne-cross-s3
+RUN go build && go install
+
 # Build the fyne-cross base image
 FROM golang:${GO_VERSION}-buster AS base
 ARG FIXUID_VERSION
 
 COPY --from=tools /go/bin/fyne /usr/local/bin
+COPY --from=tools /go/bin/fyne-cross-s3 /usr/local/bin
 
 RUN apt-get update -qq \
     && apt-get install -y -q --no-install-recommends \

docker/windows/Dockerfile

@@ -17,6 +17,7 @@ RUN apt-get update \
     && apt-get install -y -q --no-install-recommends \
         gcc-mingw-w64 \
         parallel \
+        zip \
     && apt-get -qy autoremove \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*;

go.mod

@@ -3,8 +3,16 @@ module github.com/fyne-io/fyne-cross
 go 1.14
 
 require (
-	github.com/BurntSushi/toml v1.0.0
+	github.com/BurntSushi/toml v1.1.0
 	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
+	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/fyne-io/fyne-cross/internal/cloud v0.0.0
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
+	github.com/ulikunitz/xz v0.5.10 // indirect
+	github.com/urfave/cli/v2 v2.11.1
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
 )
+
+replace github.com/fyne-io/fyne-cross/internal/cloud v0.0.0 => ./internal/cloud

internal/cloud/go.mod

@@ -0,0 +1,56 @@
+module fyne.io/fyne-cross/internal/cloud
+
+go 1.18
+
+require (
+	github.com/aws/aws-sdk-go v1.41.19
+	github.com/klauspost/compress v1.13.4
+	github.com/mholt/archiver/v3 v3.5.1
+	golang.org/x/sync v0.1.0
+	k8s.io/api v0.18.19
+	k8s.io/apimachinery v0.18.19
+	k8s.io/client-go v0.18.17
+	k8s.io/kubectl v0.18.17
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
+	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.1.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/pgzip v1.2.5 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/nwaples/rardecode v1.1.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.2 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/testify v1.6.1 // indirect
+	github.com/ulikunitz/xz v0.5.9 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	sigs.k8s.io/structured-merge-diff/v3 v3.0.1 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
+)