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

Verified Commit a5cbc7c0 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Fix mac OS build on gitlab

parent 371fa243

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ build-macos: 
  artifacts:

    name: "easy-installer-mac"

    paths:

      - Mac-build/EasyInstaller.app

      - Mac-build/EasyInstaller.dmg



build-aur:

  image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG
@@ -165,7 +165,7 @@ publish-macos: 
    - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts

    - chmod 644 ~/.ssh/known_hosts

  script:

    - "rsync -avz Mac-build/EasyInstaller.app $PUBLISH_USER@$PUBLISH_URL:$PUBLISH_DEST"

    - "rsync -avz Mac-build/EasyInstaller.dmg $PUBLISH_USER@$PUBLISH_URL:$PUBLISH_DEST"

    - ssh $PUBLISH_USER@$PUBLISH_URL "mv $PUBLISH_DEST/* $RELEASE_DEST/"

  rules:

    - if: '$CI_COMMIT_TAG'

Dockerfile

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

ENV SNAP_ARCH="amd64"



RUN apt-get install -y nsis rsync

RUN apt-get install -y nsis rsync hfsprogs hfsplus



# install jvm

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

Mac-build/mac_package.sh

+6 −5
Original line number Diff line number Diff line 
#!/bin/bash

#!/bin/bash -e



APPNAME=EasyInstaller

DIR="$APPNAME.app/Contents/MacOS"
@@ -28,10 +28,11 @@ echo $SIZE 


dd if=/dev/zero of=/tmp/EasyInstaller.dmg bs=1M count=$SIZE status=progress

mkfs.hfsplus -v Install /tmp/EasyInstaller.dmg

sudo mkdir -pv /tmp/mnt-easyinstaller

sudo mount -o loop /tmp/EasyInstaller.dmg /tmp/mnt-easyinstaller

sudo cp -av EasyInstaller-installer/* /tmp/mnt-easyinstaller

sudo umount /tmp/mnt-easyinstaller

mkdir -pv /tmp/mnt-easyinstaller

mount -o loop /tmp/EasyInstaller.dmg /tmp/mnt-easyinstaller

cp -av EasyInstaller-installer/* /tmp/mnt-easyinstaller

umount /tmp/mnt-easyinstaller



rm -rf "$APPNAME.app"

rm -rf EasyInstaller-installer

mv /tmp/EasyInstaller.dmg .