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

Commit f3ecd117 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch '427-fp-publish' into 'master' 

mac os publishing

Closes #439

See merge request !187
parents bc52bfc4 59d55e87

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ sources/ 
.waiting.lock

.cables/

.devices/

.DS_Store

Mac-build/EasyInstaller-installer/

bin/

.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/.DS_Store

deleted100644 → 0
−6 KiB

File deleted.

View file

Mac-build/Info.plist

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

<plist version="1.0">

<dict>

  <key>CFBundleGetInfoString</key>

  <string>0.15.2</string>

  <key>CFBundleShortVersionString</key>

  <string>0.15.2</string>

  <key>CFBundleExecutable</key>

  <string>EasyInstaller</string>

  <key>CFBundleIdentifier</key>

  <string>ecorp.easy.installer/ecorp.easy.installer.EasyInstaller</string>

  <key>CFBundleName</key>

  <string>Easy Installer</string>

  <key>CFBundleIconFile</key>

  <string>easy-installer.png</string>

  <key>CFBundleInfoDictionaryVersion</key>

  <string>6.0</string>

  <key>CFBundlePackageType</key>

  <string>APPL</string>

</dict>

</plist>