mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-29 15:51:17 +00:00
Update SyncthingNative to v1.1.0 (#348)
* Use go stable instead of 1.9 for travis (#1283) * Restore modules * Update Syncthing submodule to v1.1.0 * Update .gitignore * Update whatsnew
This commit is contained in:
parent
30d493a206
commit
c1abb476b6
5 changed files with 8 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -38,6 +38,9 @@ syncthing/go.zip
|
|||
syncthing/android-ndk-r*
|
||||
syncthing/ndk.zip
|
||||
|
||||
# Go modules
|
||||
syncthing/pkg/mod/
|
||||
|
||||
# MinGit
|
||||
syncthing/mingit
|
||||
syncthing/mingit.zip
|
||||
|
|
|
@ -22,7 +22,7 @@ before_install:
|
|||
# Install Go using gimme tool
|
||||
- curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
|
||||
- chmod +x ~/bin/gimme
|
||||
- eval "$(gimme 1.9)"
|
||||
- eval "$(gimme stable)"
|
||||
# Hack to accept Android licenses
|
||||
- yes | sdkmanager "platforms;android-27"
|
||||
|
||||
|
|
|
@ -5,5 +5,5 @@ Enhancements
|
|||
Fixes
|
||||
* Minor fixes (#342) (#343)
|
||||
Notes
|
||||
* Syncthing v1.0.1
|
||||
* Syncthing v1.1.0
|
||||
* Refer to GitHub for detailed change log.
|
||||
|
|
|
@ -345,10 +345,12 @@ for target in BUILD_TARGETS:
|
|||
environ = os.environ.copy()
|
||||
environ.update({
|
||||
'GOPATH': module_dir,
|
||||
'GO111MODULE': 'on',
|
||||
'CGO_ENABLED': '1',
|
||||
})
|
||||
|
||||
print('Building syncthing version', syncthingVersion);
|
||||
subprocess.check_call([go_bin, 'mod', 'download'], cwd=syncthing_dir)
|
||||
subprocess.check_call([
|
||||
go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'],
|
||||
'-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']),
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 1e69997ecdbf87ceaad76bd0149d98f560f4fdb5
|
||||
Subproject commit f0f79a3e3e861b79da2b09f563e9d373255419f0
|
Loading…
Reference in a new issue