Merge branch 'trunk' into displaynames
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
commit
4776031630
43
.drone.yml
43
.drone.yml
|
@ -6,7 +6,6 @@ name: linux-android-test
|
|||
clone:
|
||||
disable: true
|
||||
|
||||
|
||||
steps:
|
||||
- name: clone
|
||||
image: cirrusci/flutter:dev
|
||||
|
@ -152,42 +151,29 @@ trigger:
|
|||
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: delay-windows
|
||||
|
||||
clone:
|
||||
disable: true
|
||||
|
||||
steps:
|
||||
- name: sleep
|
||||
image: cirrusci/flutter:dev
|
||||
commands:
|
||||
- sleep 90
|
||||
|
||||
trigger:
|
||||
repo: flutter/flutter_app
|
||||
branch: trunk
|
||||
event:
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: exec
|
||||
name: windows
|
||||
|
||||
platform:
|
||||
os: windows
|
||||
version: 1809
|
||||
|
||||
clone:
|
||||
disable: true
|
||||
|
||||
steps:
|
||||
- name: clone
|
||||
commands:
|
||||
- git clone gogs@git.openprivacy.ca:flutter/flutter_app.git .
|
||||
- git checkout $DRONE_COMMIT
|
||||
|
||||
- name: fetch
|
||||
image: openpriv/flutter-desktop:windows-dev
|
||||
commands:
|
||||
- git fetch --tags
|
||||
- powershell -command "git describe --tags > VERSION"
|
||||
- powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm' >.\BUILDDATE"
|
||||
- .\fetch-libcwtch-go.ps1
|
||||
- name: build-windows
|
||||
image: openpriv/flutter-desktop:windows-dev
|
||||
commands:
|
||||
- flutter pub get
|
||||
- flutter build windows
|
||||
|
@ -207,9 +193,7 @@ steps:
|
|||
- dir
|
||||
- dir deploy
|
||||
- name: deploy-windows
|
||||
#image: openpriv/flutter-desktop:windows-dev
|
||||
image: openpriv/pscp:latest
|
||||
when:
|
||||
when:
|
||||
event: push
|
||||
status: [ success ]
|
||||
environment:
|
||||
|
@ -227,7 +211,4 @@ trigger:
|
|||
repo: flutter/flutter_app
|
||||
branch: trunk
|
||||
event:
|
||||
- push
|
||||
|
||||
depends_on:
|
||||
- delay-windows
|
||||
- push
|
|
@ -1 +1 @@
|
|||
v0.0.2-8-g3f07d9a-2021-04-28-22-47
|
||||
v0.0.2-13-g8f493b8-2021-05-03-18-51
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
$Env:VERSION = type LIBCWTCH-GO.version
|
||||
echo $Env:VERSION
|
||||
|
||||
Invoke-WebRequest -Uri https://build.openprivacy.ca/files/libCwtch-go-$Env:VERSION/libCwtch.dll -OutFile windows/libCwtch.dll
|
||||
|
||||
#Invoke-WebRequest -Uri https://build.openprivacy.ca/files/libCwtch-go-$Env:VERSION/cwtch.aar -OutFile android/cwtch/cwtch.aar
|
||||
#Invoke-WebRequest -Uri https://build.openprivacy.ca/files/libCwtch-go-$Env:VERSION/libCwtch.so -Outfile linux/libCwtch.so
|
|
@ -4,6 +4,6 @@ VERSION=`cat LIBCWTCH-GO.version`
|
|||
echo $VERSION
|
||||
|
||||
wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/cwtch.aar -O android/cwtch/cwtch.aar
|
||||
wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.dll -O windows/libCwtch.dll
|
||||
wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.so -O linux/libCwtch.so
|
||||
|
||||
# wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.dll -O windows/libCwtch.dll
|
||||
|
|
Loading…
Reference in New Issue