Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe44715 authored by Frank Preel's avatar Frank Preel
Browse files

Merge branch 'master' into 412_pixel_4a_5g

parents 5f943612 83b44423

.gitlab-ci.yml

+24 −14
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ stages: 
- publish



check-version:

  image: registry.gitlab.e.foundation/e/devices/easy-installer:stable

  stage: test

  variables:

    JAVA_VERSION_FILE: "src/main/java/ecorp/easy/installer/AppConstants.java"
@@ -36,6 +37,11 @@ build-docker: 
    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation

    - docker build --cache-from $CONTAINER_IMAGE:$CONTAINER_TAG -t $CONTAINER_IMAGE:$CONTAINER_TAG .

    - docker push $CONTAINER_IMAGE:$CONTAINER_TAG

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

        - Dockerfile

      when: manual



build-aur-docker:

# build AUR docker image
@@ -55,6 +61,11 @@ build-aur-docker: 
    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY

    - cd docker && docker build --cache-from $CONTAINER_IMAGE/aur:$CONTAINER_TAG -f Dockerfile.arch -t $CONTAINER_IMAGE/aur:$CONTAINER_TAG .

    - docker push $CONTAINER_IMAGE/aur:$CONTAINER_TAG

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

        - Dockerfile.arch

      when: manual



build-snap:

  image: registry.gitlab.e.foundation/e/devices/easy-installer:stable
@@ -115,7 +126,6 @@ build-macos: 
build-aur:

  image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG

  stage: build

  needs: ["build-aur-docker"]

  before_script:

    - mkdir dist && cp -a pkg/arch/. dist

  script:
@@ -133,7 +143,7 @@ publish-ubuntu: 
    RELEASE_TYPE: beta

  script:

    - echo ${SNAPCRAFT_LOGIN_FILE} | base64 -d > snapcraft.login && snapcraft login --with snapcraft.login

    - snapcraft push *.snap --release $RELEASE_TYPE

    - snapcraft upload *.snap --release $RELEASE_TYPE

    - snapcraft logout && rm snapcraft.login

  rules:

    - if: '$CI_COMMIT_TAG'

Dockerfile

+5 −1
Original line number Diff line number Diff line
@@ -19,4 +19,8 @@ ENV SNAP="/snap/snapcraft/current" 
ENV SNAP_NAME="snapcraft"

ENV SNAP_ARCH="amd64"



RUN apt-get install -y openjdk-11-jdk nsis rsync
 
 No newline at end of file
 
RUN apt-get install -y nsis rsync



# install jvm

COPY buildSrc/linux/jdk-11.0.2 /usr/lib/jdk/jdk-11.0.2

ENV JAVA_HOME=/usr/lib/jdk/jdk-11.0.2

README.md

+0 −97
Original line number Diff line number Diff line 
# Easy Installer

**Current Version:** v0.15.0

**Current released Version:** v0.15.0



Members:

- Gaël

- Romain

- Alexis

- Vincent

- Arnau

- Manoj

- Nicolas

- Rohit

- Frank



Community:

- Ingo

- steadfasterX

- André Lam

- Omer Akram

- Alandour

- Mex Salem

- F. Wildermuth

- Anonymous

- Nikolay Sinyov

- avtkal

- Paolo Pantaleo

- Tim de Boer

- Edoardo Regni

- Porrumentzio

- Piero

- GunChleoc



Reviewer

- Alexandre

- Sooraj

- Romain

- Kumar

- Nicolas



developer: 

- [Vincent Bourgmayer](vincent.bourgmayer@e.email)

- Frank Preel

- Rohit

- Israel Yago pereira



## Changelogs

### v0.16.0 (candidate)

- Pixel 4a 5G



### v0.15.0 

- No shortcut created when installing from a non-admin account on Windows

- e-recovery assets

- Update German translation - by F. Wildermuth

- Herolte & Hero2lte: Flash Android Q

- Gitlab job for linux build has been fixed - by Nicolas

- Update version number to v0.15.0



### v0.14.0 (unreleased)

- Update Readme

- Update version number to v0.14.0

- Use of the same unit (Mb, Gb..) on the download progress bar

- Add Android Q support for the model below

	- star2lte

	- starlte

-Add support for 

	- Teracube 2e

	- Pixel 4

	- Pixel 4XL

	- Pixel 4a

	- Oneplus 7

	- Oneplus 7Pro

	- Oneplus 8

	- Oneplus 8Pro

- MacOS support

- Cosmetic bugfix (386)

- Fix username with spaces issue on Windows



### v0.13.4-beta (unreleased)

- Fix Ubuntu build's docker image - by Israel & Omer Akram & Nicolas

- Refactor classes related to script execution

- Update Russian translations - by Nikolay Sinyov

- Update German translations - by F. Wildermuth

- Update Gaelic translations - by GunChleoc

- Teracube 2e support disabled (temporarily)

- Update Readme

- update version number to v0.13.4-beta



### v0.13.3-beta (latest release)

- Refactor user interface related to flashing device

- Refactor Configuration file

- Handle "Too many devices detected"

- Update version number to v0.13.3-beta

- Fixed e-mail registration API Url - by Israel Yago pereira

- Update Russian translations - by Nikolay Sinyov & Israel Yago pereira

- Update German translations - by F. Wildermuth

- Update Dutch translations - by Edoardo Regni

- Update config file for arch-linux build - by steadfasterX



## Documentation

To run directly from source:

check-version.sh

+10 −8
Original line number Diff line number Diff line 
#!/bin/bash



JAVA_VERSION=$(cat $JAVA_VERSION_FILE | grep "appTitle" | sed -E 's/.*"(v.*)".*/\1/')

JAVA_VERSION=$(cat $JAVA_VERSION_FILE | grep "APP_VERSION" | sed -E 's/.*"(v.*)".*/\1/')

echo "Java version: $JAVA_VERSION ($JAVA_VERSION_FILE)"



SNAPCRAFT_VERSION=$(cat $SNAPCRAFT_VERSION_FILE | grep "^version" | sed -E "s/^version: '(v.*)'.*/\1/")
@@ -9,12 +9,14 @@ echo "Snapcraft version: $SNAPCRAFT_VERSION ($SNAPCRAFT_VERSION_FILE)" 
WINDOWS_VERSION=$(cat $WINDOWS_VERSION_FILE | grep "define appVersion" | sed -E 's/!define appVersion "(v.*)"/\1/')

echo "Windows version: $WINDOWS_VERSION ($WINDOWS_VERSION_FILE)"



AUR_VERSION=$(cat $AUR_VERSION_FILE | grep "^pkgver" | sed 's/[^=]*= *//;s/.*/v&-beta/')

AUR_VERSION=$(cat $AUR_VERSION_FILE | grep "^pkgver" | sed 's/[^=]*= *//;s/.*/v&/')

echo "AUR version: $AUR_VERSION ($AUR_VERSION_FILE)"



echo "Tag version: $CI_COMMIT_TAG"



if [ $JAVA_VERSION != $CI_COMMIT_TAG ] || [ $SNAPCRAFT_VERSION != $CI_COMMIT_TAG ] || [ $WINDOWS_VERSION != $CI_COMMIT_TAG ] || [ $AUR_VERSION_VERSION != $CI_COMMIT_TAG ]

if [ "$JAVA_VERSION" == "$CI_COMMIT_TAG" ] && [ "$SNAPCRAFT_VERSION" == "$CI_COMMIT_TAG" ] && [ "$WINDOWS_VERSION" == "$CI_COMMIT_TAG" ] && [ "$AUR_VERSION" == "$CI_COMMIT_TAG" ]

then

  exit 1

  exit 0

fi



exit 1

docker/Dockerfile.arch

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ RUN mkdir /home/builder/pkg &&\ 
    curl -o '/home/builder/pkg/PKGBUILD' https://gitlab.e.foundation/e/devices/easy-installer/-/raw/master/pkg/arch/PKGBUILD && \

    cd /home/builder/pkg/ && \

    sudo pacman -Syyu --noconfirm && \

    yes | makepkg -seo && \

    yes | sudo pacman -Scc && sudo rm -fr /var/lib/pacman/sync/*

    makepkg --noconfirm -seo && \

    sudo pacman -Scc --noconfirm && sudo rm -fr /var/lib/pacman/sync/*



# remove files after installing dependecies

RUN sudo rm -rf /home/builder/pkg/