diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6ecc3ae1..00000000 --- a/.travis.yml +++ /dev/null @@ -1,48 +0,0 @@ -language: cpp -os: -- linux -- osx -sudo: false -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - libzmq3-dev - - libprotobuf-dev - - graphicsmagick - - g++-4.9 - - yasm -env: - matrix: - - NODE_VERSION=8.16.1 -matrix: - allow_failures: - - os: osx - fast_finish: true -before_install: -- rm -rf ~/.nvm && git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm -- rm .nvmrc -- source ~/.nvm/nvm.sh -- nvm install $NODE_VERSION -- node --version -- npm --version -- npm set progress=false -- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then export CXX=g++-4.9; fi -- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then brew install rethinkdb graphicsmagick - zeromq protobuf yasm pkg-config; fi -install: -- npm install -- export PATH=$PWD/node_modules/.bin:$PATH - -script: -- npm test -- gulp build - -cache: - directories: - - node_modules - - res/bower_components -notifications: - slack: - secure: F+Xq1LGQgPZtEkHB2EX6rK1MEdoCRAig8gl16hiRBJ8di6bvKvUS8sF/vLtRrbX1LdjyxsbZDhX2qrA+3bBkzLgsVulcH+jdmaiRI0kNjjTxvLXYfIgTrHhiyXUg9lItEMR0JjcGFe3D5FVkPx4bcvS5ZrfsIu1a/Hm7JzdxI3BaBkHe5k9xshvnyr+joc2DyPQp+rvVBukhr9sSrJMrGvGtMgzlpUlb3dr7BeeSTKqdG7NgGc3NL2mb2ugookh+vPP26RT6Vsk6wFGY/hnP7EFbHmM1L8yEEskjLuOMxl6xmcA/fCpJov/6kXf+KxQIwtl5XUgR0HM5O8BHXid2rLIxIu4YIpd4pAXuuUTqXdnETbGBfzn8DP4h0y0zYGRLWC/NEuBalWU165KbA/wgsU24Zo6tcViqozzpiyjGJSxElVTcIkiAbKyHGjahNdPBj3kz0KwiV36B/eo3IHHl5Udm2DL2nvqUD/BtitprnCYSInXF5x/3T69pgV6M7rIztH0rmWRiSvRy3mqgB8mTbfMD+9rvS5DY6zygb1tUPOTGeVSTLARi+Kn1UladA2XYxvBUYwWua+wB4wOiLfY+HBuXeXQBSYVLjz8pBMUF9dGBwsrlb9DeQviCEIaDavqnLliEnPHH7yPp32QD0zPE2s5P9TPLByypL8VFuTs/hNI= diff --git a/CHANGELOG.md b/CHANGELOG.md index d384324c..8ecde9ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 3.6.0 (2021-03-09) + +### Fixes + +- Fix AAB installation fails when /tmp is on different mountpoint than storage-temp save directory [#139](https://github.com/DeviceFarmer/stf/pull/139) + +### Enhancements + +- Update dependency versions, including adbkit rewritten in TypeScript + ## 3.5.0 (2020-10-18) ### Fixes diff --git a/Dockerfile-debian-x86_64 b/Dockerfile-debian-x86_64 index e1ea5d14..f2e8ec36 100644 --- a/Dockerfile-debian-x86_64 +++ b/Dockerfile-debian-x86_64 @@ -34,7 +34,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ --shell /usr/sbin/nologin \ stf && \ su stf -s /bin/bash -c '/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js install' && \ - apt-get -y install --no-install-recommends libzmq3-dev libprotobuf-dev git graphicsmagick yasm && \ + apt-get -y install --no-install-recommends libzmq3-dev libprotobuf-dev git graphicsmagick yasm cmake && \ echo '--- Building app' && \ mkdir -p /app && \ chown -R stf:stf /tmp/build && \ @@ -43,7 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ export PATH=$PWD/node_modules/.bin:$PATH && \ sed -i'' -e '/phantomjs/d' package.json && \ npm install -g npm && \ - echo 'npm install --no-optional --loglevel http' | su stf -s /bin/bash && \ + echo 'npm install --no-optional --loglevel http --legacy-peer-deps' | su stf -s /bin/bash && \ echo '--- Assembling app' && \ echo 'npm pack' | su stf -s /bin/bash && \ tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \ diff --git a/package.json b/package.json index fa93b1e1..ff3423fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devicefarmer/stf", - "version": "3.5.0", + "version": "3.6.0", "description": "Smartphone Test Farm", "keywords": [ "adb", @@ -15,8 +15,8 @@ "license": "Apache-2.0", "author": { "name": "The DeviceFarmer Project", - "email": "contact@openstf.io", - "url": "https://devicefarmer.github.io" + "email": "contact@devicefarmer.com", + "url": "https://devicefarmer.com" }, "repository": { "type": "git", @@ -34,9 +34,9 @@ }, "dependencies": { "@slack/client": "^3.5.4", - "@devicefarmer/adbkit": "^2.11.3", + "@devicefarmer/adbkit": "^3.2.0", "@devicefarmer/adbkit-apkreader": "^3.2.2", - "@devicefarmer/adbkit-monkey": "^1.0.1", + "@devicefarmer/adbkit-monkey": "^1.1.0", "android-device-list": "^1.2.1", "aws-sdk": "^2.4.13", "basic-auth": "^1.0.3", @@ -63,7 +63,7 @@ "lodash": "^4.14.2", "markdown-serve": "^0.8.0", "mime": "^1.3.4", - "@devicefarmer/minicap-prebuilt": "^2.5.0", + "@devicefarmer/minicap-prebuilt": "^2.6.0", "minimatch": "^3.0.3", "@devicefarmer/minitouch-prebuilt": "^1.3.0", "my-local-ip": "^1.0.0", @@ -86,7 +86,7 @@ "@devicefarmer/stf-appstore-db": "^1.0.0", "@devicefarmer/stf-browser-db": "^1.0.2", "@devicefarmer/stf-device-db": "^1.2.0", - "@devicefarmer/stf-syrup": "^1.0.1", + "@devicefarmer/stf-syrup": "^1.0.2", "@devicefarmer/stf-wiki": "^1.0.0", "swagger-express-mw": "^0.7.0", "swagger-tools": "^0.10.3", diff --git a/vendor/STFService/STFService.apk b/vendor/STFService/STFService.apk index 01bd3282..ad8fbaf3 100644 Binary files a/vendor/STFService/STFService.apk and b/vendor/STFService/STFService.apk differ