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

Commit 59f61aa5 authored by Jackeagle's avatar Jackeagle
Browse files

easy-installer: Start using Workspace instead of root for everything 



- Some improvements

Signed-off-by: default avatarJackeagle <jackeagle102@gmail.com>
parent 8ba0611b

.gitlab-ci.yml

+20 −25
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stages: 
  - publish



check-version:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: test

  script:

    - ./version.sh check
@@ -39,10 +39,6 @@ build-docker: 
      when: manual



build-aur-docker:

# build AUR docker image

# the image is different from the build-docker (which using docker:19) step as

# archlinux/archlinux docker image fails with

# error: failed to initialize alpm library:

  image: docker:20

  stage: prepare

  services:
@@ -63,11 +59,11 @@ build-aur-docker: 
      when: manual



build-snap:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: build

  variables:

    GIT_SUBMODULE_STRATEGY: recursive

  script:

    - cp -r $CI_PROJECT_DIR/* /Workspace/

    - cd /Workspace

    - snapcraft

    - ls

  artifacts:
@@ -76,11 +72,11 @@ build-snap: 
      - easy-installer*.snap



build-linux-x64:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: build

  variables:

    GIT_SUBMODULE_STRATEGY: recursive

  script:

    - cp -r $CI_PROJECT_DIR/* /Workspace/

    - cd /Workspace

    - ./gradlew dist

  artifacts:

    name: "easy-installer-$CI_COMMIT_TAG-linux_x64"
@@ -90,11 +86,11 @@ build-linux-x64: 
    - if: $CI_COMMIT_TAG



build-windows:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: build

  variables:

    GIT_SUBMODULE_STRATEGY: recursive

  script:

    - cp -r $CI_PROJECT_DIR/* /Workspace/

    - cd /Workspace

    - ./gradlew jlink -Pkey="$PEPPER"

    - makensis windows-installer-mui.nsi

    - sha256sum Easy-installer-setup.exe > Easy-installer-setup.exe.sha256sum
@@ -105,13 +101,13 @@ build-windows: 
      - Easy-installer-setup.exe.sha256sum



build-macos:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  tags:

    - generic_privileged

  stage: build

  variables:

    GIT_SUBMODULE_STRATEGY: recursive

  script:

    - cp -r $CI_PROJECT_DIR/* /Workspace/

    - cd /Workspace

    - ./gradlew jlink

    - cd Mac-build

    - ./mac_package.sh
@@ -135,7 +131,7 @@ build-aur: 
      - dist/*.pkg.tar.zst



publish-ubuntu:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: publish

  needs: ["build-snap"]

  variables:
@@ -148,9 +144,8 @@ publish-ubuntu: 
    - if: '$CI_COMMIT_TAG'

      when: manual





publish-macos:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: publish

  needs: ["build-macos"]

  variables:
@@ -171,7 +166,7 @@ publish-macos: 
      when: manual



publish-windows:

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

  image: $CONTAINER_IMAGE:$CONTAINER_TAG

  stage: publish

  needs: ["build-windows"]

  variables:

Dockerfile

+11 −7
Original line number Diff line number Diff line 
FROM snapcore/snapcraft:stable as builder



FROM ubuntu:bionic



COPY --from=builder /snap/core /snap/core

COPY --from=builder /snap/core18 /snap/core18

COPY --from=builder /snap/snapcraft /snap/snapcraft

COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft



# Install necessary packages

RUN apt-get update && apt-get dist-upgrade --yes && \

    apt-get install --yes snapd sudo locales && \

    locale-gen en_US.UTF-8 && \

    apt-get install --yes iputils-ping wget unzip gcc nsis rsync hfsprogs hfsplus



# Generate locale.

RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo locales && locale-gen en_US.UTF-8



# Set the proper environment.

# Set the proper environment

ENV LANG="en_US.UTF-8"

ENV LANGUAGE="en_US:en"

ENV LC_ALL="en_US.UTF-8"
@@ -19,8 +22,9 @@ ENV SNAP="/snap/snapcraft/current" 
ENV SNAP_NAME="snapcraft"

ENV SNAP_ARCH="amd64"



RUN apt-get install -y nsis rsync hfsprogs hfsplus



# install jvm

# 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



# Set the working directory to /Workspace

WORKDIR /Workspace