Skip to content

Commit ff9f4d4

Browse files
authored
Merge pull request #15 from risinek/update-android-11-support
ANDROID-4181 Update android 11 support
2 parents ce9587e + a9b1950 commit ff9f4d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1634
-700
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ A clear and concise description of any alternative solutions or features you've
1515

1616
**Additional context**
1717
Add any other context or screenshots about the feature request here.
18-
19-
<!-- Love OpenSTF? Please consider supporting our collective:
20-
👉 https://opencollective.com/openstf/donate -->

.semaphore/deploy_dockerhub.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: v1.0
2+
name: Deploy to DockerHub
3+
blocks:
4+
- name: Deploy to DockerHub
5+
task:
6+
jobs:
7+
- name: Deploy
8+
commands:
9+
- checkout
10+
- 'docker build . -t "devicefarmer/stf:$(echo ${SEMAPHORE_GIT_TAG_NAME:-vlatest} |cut -c 2-)"'
11+
- docker push devicefarmer/stf
12+
secrets:
13+
- name: dockerhub-secrets
14+
prologue:
15+
commands:
16+
- 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
17+
dependencies: []
18+
agent:
19+
machine:
20+
type: e1-standard-2
21+
os_image: ubuntu1804

.semaphore/deploy_npmjs.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: v1.0
2+
name: Deploy to npmjs
3+
blocks:
4+
- name: Deploy to npmjs
5+
task:
6+
jobs:
7+
- name: Deploy
8+
commands:
9+
- install-package libzmq3-dev libprotobuf-dev graphicsmagick yasm gulp
10+
- sem-version node 8.16.1
11+
- checkout
12+
- npm install
13+
- npm publish --access=public
14+
secrets:
15+
- name: npmjs
16+
agent:
17+
machine:
18+
type: e1-standard-2
19+
os_image: ubuntu1804

.semaphore/semaphore.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
version: v1.0
2+
name: Docker
3+
agent:
4+
machine:
5+
type: e1-standard-2
6+
os_image: ubuntu1804
7+
blocks:
8+
- name: Build Standard Docker image
9+
task:
10+
jobs:
11+
- name: docker build
12+
commands:
13+
- checkout
14+
- docker build .
15+
dependencies: []
16+
- name: Build npm package
17+
dependencies: []
18+
task:
19+
jobs:
20+
- name: npm test
21+
commands:
22+
- install-package libzmq3-dev libprotobuf-dev graphicsmagick yasm gulp
23+
- sem-version node 8.16.1
24+
- checkout
25+
- npm install
26+
- npm test
27+
- name: Build Debian Docker image
28+
dependencies: []
29+
task:
30+
jobs:
31+
- name: docker build
32+
commands:
33+
- checkout
34+
- docker build . -f Dockerfile-debian-x86_64
35+
promotions:
36+
- name: Deploy to DockerHub
37+
pipeline_file: deploy_dockerhub.yml
38+
auto_promote:
39+
when: (branch = 'master' OR tag =~ '.*') AND result = 'passed'
40+
- name: Deploy to npmjs
41+
pipeline_file: deploy_npmjs.yml
42+
auto_promote:
43+
when: tag =~ '.*' AND result = 'passed'

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,47 @@
11
# Changelog
22

3+
## 3.5.0 (2020-10-18)
4+
5+
### Fixes
6+
7+
- Update dependency versions
8+
- Fix minicap disconnection on getting file [#97](https://github.com/DeviceFarmer/stf/pull/97)
9+
- Fix icons displaying [#59](https://github.com/DeviceFarmer/stf/pull/59). Thanks @Cookies52!
10+
11+
### Enhancements
12+
13+
- Add .aab installation support [#103](https://github.com/DeviceFarmer/stf/pull/103). Thanks @nghiaviminh!
14+
- Change jpeg-turbo dependency to `@julusian/jpeg-turbo` [#90](https://github.com/DeviceFarmer/stf/pull/90)
15+
- Add Android 11 support
16+
17+
## 3.4.3 (2020-07-21)
18+
19+
### Misc
20+
21+
- Changed dependencies to equivalents using **@devicefarmer** scope
22+
23+
## 3.4.2 (2020-05-31)
24+
25+
### Fixes
26+
27+
- Fixed SAML_ID_PROVIDER_CERT_PATH in example SAML auth provider unit [#1061](https://github.com/openstf/stf/pull/1061). Thanks @mitchtech!
28+
- Fixed Chinese characters handling [#1204](https://github.com/openstf/stf/pull/1204). Thanks @xu-duqing!
29+
30+
### Enhancements
31+
32+
- Updated STFService.apk, minitouch and minicap to support Android 10. Thanks @denis99999 and @pcrepieux!
33+
- Added addAdbPublicKey endpoint [#770](https://github.com/openstf/stf/pull/770). Thanks @neofreko!
34+
- Added pt_BR translation [#1038](https://github.com/openstf/stf/pull/1038). Thanks @esmiralha!
35+
- Added market name to device properties [#1002](https://github.com/openstf/stf/pull/1002).
36+
- Added [group feature](https://github.com/openstf/stf/blob/master/doc/GroupFeature.pdf) [#1056](https://github.com/openstf/stf/pull/1056). Thanks @denis99999!
37+
- Added validation for filter.pid/ filter.tid/ filter.data input objects [#1074](https://github.com/openstf/stf/pull/1074). Thanks @lukzeg!
38+
- Added opening device view via reselecting device from device view [#1077](https://github.com/openstf/stf/pull/1077). Thanks @lukzeg!
39+
- Added device logs separation [#1095](https://github.com/openstf/stf/pull/1095). Thanks @lukzeg!
40+
- Updated NodeJS to 8.9.3 [#1169](https://github.com/openstf/stf/pull/1169).
41+
- Added alternative dockerfiles for armhf and x86_64 architectures [#1174](https://github.com/openstf/stf/pull/1174), [#1191](https://github.com/openstf/stf/pull/1191). Thanks @denis99999 and @petemyron!
42+
- Added touchMove error handling [#1189](https://github.com/openstf/stf/pull/1189). Thanks @att55!
43+
44+
345
## 3.4.1 (2019-05-03)
446

547
### Fixes

Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
3232
tar -xJf node-v*.tar.xz --strip-components 1 -C /usr/local && \
3333
rm node-v*.tar.xz && \
3434
su stf-build -s /bin/bash -c '/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js install' && \
35-
apt-get -y install libzmq3-dev libprotobuf-dev git graphicsmagick yasm && \
35+
apt-get -y install libzmq3-dev libprotobuf-dev git graphicsmagick openjdk-8-jdk yasm && \
3636
apt-get clean && \
37-
rm -rf /var/cache/apt/* /var/lib/apt/lists/*
37+
rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \
38+
mkdir /tmp/bundletool && \
39+
cd /tmp/bundletool && \
40+
wget --progress=dot:mega \
41+
https://github.com/google/bundletool/releases/download/1.2.0/bundletool-all-1.2.0.jar && \
42+
mv bundletool-all-1.2.0.jar bundletool.jar
3843

3944
# Copy app source.
4045
COPY . /tmp/build/
4146

4247
# Give permissions to our build user.
4348
RUN mkdir -p /app && \
44-
chown -R stf-build:stf-build /tmp/build /app
49+
chown -R stf-build:stf-build /tmp/build /tmp/bundletool /app
4550

4651
# Switch over to the build user.
4752
USER stf-build
@@ -52,13 +57,15 @@ RUN set -x && \
5257
export PATH=$PWD/node_modules/.bin:$PATH && \
5358
npm install --loglevel http && \
5459
npm pack && \
55-
tar xzf stf-*.tgz --strip-components 1 -C /app && \
60+
tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
5661
bower cache clean && \
5762
npm prune --production && \
5863
mv node_modules /app && \
5964
rm -rf ~/.node-gyp && \
65+
mkdir /app/bundletool && \
66+
mv /tmp/bundletool/* /app/bundletool && \
6067
cd /app && \
61-
rm -rf /tmp/*
68+
find /tmp -mindepth 1 ! -regex '^/tmp/hsperfdata_root\(/.*\)?' -delete
6269

6370
# Switch to the app user.
6471
USER stf

Dockerfile-debian-armhf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM arm32v7/debian:stretch-slim
66

77
LABEL Maintainer="Denis Barbaron <denis.barbaron@orange.com>"
88
LABEL Name="STF"
9-
LABEL Url="https://github.com/openstf/stf/"
9+
LABEL Url="https://github.com/devicefarmer/stf/"
1010
LABEL Description="STF docker image for armhf architecture"
1111

1212
# Sneak the stf executable into $PATH.
@@ -23,7 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
2323
echo '--- Updating repositories' && \
2424
apt-get update && \
2525
echo '--- Building node' && \
26-
apt-get -y install wget python build-essential && \
26+
apt-get -y install wget python build-essential cmake && \
2727
cd /tmp && \
2828
wget --progress=dot:mega \
2929
https://nodejs.org/dist/v9.9.0/node-v9.9.0-linux-armv7l.tar.xz && \
@@ -42,12 +42,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
4242
cd /tmp/build && \
4343
export PATH=$PWD/node_modules/.bin:$PATH && \
4444
sed -i'' -e '/phantomjs/d' package.json && \
45+
npm config set unsafe-perm true && \
4546
npm install -g npm && \
4647
echo 'npm cache clean --force' | su stf -s /bin/bash && \
4748
echo 'npm install --no-optional --loglevel http' | su stf -s /bin/bash && \
4849
echo '--- Assembling app' && \
4950
echo 'npm pack' | su stf -s /bin/bash && \
50-
tar xzf stf-*.tgz --strip-components 1 -C /app && \
51+
tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
5152
echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
5253
echo 'npm prune --production' | su stf -s /bin/bash && \
5354
mv node_modules /app && \

Dockerfile-debian-x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM debian:stretch-slim
66

77
LABEL Maintainer="Denis Barbaron <denis.barbaron@orange.com>"
88
LABEL Name="STF"
9-
LABEL Url="https://github.com/openstf/stf/"
9+
LABEL Url="https://github.com/devicefarmer/stf/"
1010
LABEL Description="STF docker image for x86_64 architecture"
1111

1212
# Sneak the stf executable into $PATH.
@@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
4646
echo 'npm install --no-optional --loglevel http' | su stf -s /bin/bash && \
4747
echo '--- Assembling app' && \
4848
echo 'npm pack' | su stf -s /bin/bash && \
49-
tar xzf stf-*.tgz --strip-components 1 -C /app && \
49+
tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
5050
echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
5151
echo 'npm prune --production' | su stf -s /bin/bash && \
5252
mv node_modules /app && \

README.md

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
<img src="res/common/logo/exports/STF-128.png?raw=true" style="width:100px;height:100px;" alt="STF">
22

3-
[![Build Status](https://travis-ci.org/WanderaOrg/stf.svg?branch=master)](https://travis-ci.org/WanderaOrg/stf)
4-
[![Docker Pulls](https://img.shields.io/docker/pulls/wanderadock/stf.svg)](https://hub.docker.com/r/wanderadock/stf/)
5-
[![NPM version](https://img.shields.io/npm/v/stf.svg)](https://www.npmjs.com/package/stf)
3+
[![Build Status](https://travis-ci.org/DeviceFarmer/stf.svg?branch=master&status=created)](https://travis-ci.org/github/DeviceFarmer/stf)
4+
[![Docker Pulls](https://img.shields.io/docker/pulls/devicefarmer/stf.svg)](https://hub.docker.com/r/devicefarmer/stf/)
5+
[![npm](https://img.shields.io/npm/v/@devicefarmer/stf)](https://www.npmjs.com/package/@devicefarmer/stf)
66

77
**STF** (or Smartphone Test Farm) is a web application for debugging smartphones, smartwatches and other gadgets remotely, from the comfort of your browser.
88

9-
This is a fork of a original repository located at [https://github.com/openstf/stf](https://github.com/openstf/stf) adding Wandera specific features,
10-
STF was originally developed at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices. As of July 2016 development is mainly sponsored by [HeadSpin](https://performance.headspin.io/) and [other individual contributors](https://opencollective.com/openstf).
9+
## Overview
1110

12-
![Close-up of device shelf](doc/shelf_closeup_790x.jpg?raw=true)
11+
![Close-up of device shelf](doc/shelf_closeup_790x.jpg)
1312

14-
![Super short screencast showing usage](doc/7s_usage.gif?raw=true)
15-
16-
### Contributors
17-
Thank you to all the people who have already contributed to STF!
18-
<a href="../../graphs/contributors"><img src="https://opencollective.com/openstf/contributors.svg?width=890" /></a>
19-
20-
### Backers
21-
Thank you to all our backers! [[Become a backer](https://opencollective.com/openstf#backer)]
22-
23-
<a href="https://opencollective.com/openstf#backers" target="_blank"><img src="https://opencollective.com/openstf/backers.svg?width=890"></a>
13+
![Super short screencast showing usage](doc/7s_usage.gif)
2414

2515
## Features
2616

doc/CREDITS.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Credits
2+
3+
## History
4+
5+
### OpenSTF
6+
7+
STF was originally developed at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices. As of July 2016 development is mainly sponsored by [HeadSpin](https://performance.headspin.io/) and [other individual contributors](https://opencollective.com/openstf).
8+
9+
List of financial contributions to OpenSTF is available on [open collective](https://opencollective.com/openstf).
10+
11+
[![Backers on Open Collective](https://opencollective.com/openstf/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/openstf/sponsors/badge.svg)](#sponsors)
12+
13+
### Sponsors
14+
15+
Thank you to all our sponsors!
16+
17+
#### Gold Sponsor
18+
19+
[<img src="https://raw.githubusercontent.com/DeviceFarmer/stf/master/doc/sponsors/headspin-wordmark-orange.png?raw=true" alt="HeadSpin" width="400">](https://ui.headspin.io/register?referral=start-testing-hs)
20+
21+
> [HeadSpin](https://headspin.io/) provides secure and scalable STF for iOS integrated with Appium/XCTest/Selenium/Espresso, High speed interaction Audio/Video/Game testing and AI based Root cause analysis for Performance Management. It's free to start using HeadSpin in 150+ locations worldwide! [Try it out for free.](https://ui.headspin.io/register?referral=start-testing-hs)
22+
23+
HeadSpin offers a generous monthly contribution towards STF development.
24+
25+
### Contributors
26+
Thank you to all the people who have already contributed to STF!
27+
<img src="https://opencollective.com/openstf/contributors.svg?width=890" />
28+
29+
### Backers
30+
Thank you to all our backers!
31+
32+
<a href="https://opencollective.com/openstf#backers" target="_blank"><img src="https://opencollective.com/openstf/backers.svg?width=890"></a>
33+
34+
35+
### Sponsors
36+
37+
DeviceFarmer currently does not have open sponsorship opportunities.
38+
39+
OpenSTF sponsorship report is available on on [open collective](https://opencollective.com/openstf) and
40+
(in case of hardware-only contributions) in [donation transparency report](DONATION-TRANSPARENCY.md).
41+
42+
### Consulting services
43+
44+
DeviceFarmer does not provide consulting services other than community issue trackers.

0 commit comments

Comments
 (0)