heredoc

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
       - master
 
 env:
-  RELEASE: 3.4.0.24
+  RELEASE: 4.6.0.13
 
 jobs:
   build:

Dockerfile.arch

@@ -6,9 +6,12 @@ ARG ARCH
 
 COPY build/target-$ARCH.tar /target-$ARCH.tar
 
-RUN set -ex ;\
- sudo zypper ref ;\
- sdk-assistant -y create SailfishOS-$RELEASE-$ARCH /target-$ARCH.tar ;\
- sudo rm -f /target-$ARCH.tar ;\
- sudo rm -rf /var/cache/zypp/* ;\
- sudo rm -rf /srv/mer/targets/SailfishOS-$RELEASE-$ARCH/var/cache/zypp/*
+RUN <<EOF
+set -ex
+sudo ssu lr
+sudo zypper ref
+sdk-assistant -y create SailfishOS-$RELEASE-$ARCH /target-$ARCH.tar
+sudo rm -f /target-$ARCH.tar
+sudo rm -rf /var/cache/zypp/*
+sudo rm -rf /srv/mer/targets/SailfishOS-$RELEASE-$ARCH/var/cache/zypp/*
+EOF

Dockerfile.tooling

@@ -8,9 +8,12 @@ COPY build/tooling-i486.tar /tooling-i486.tar
 USER mersdk
 WORKDIR /home/mersdk
 
-RUN set -ex ;\
- sudo mkdir /host_targets ;\
- sudo zypper ref ;\
- sdk-assistant -y create SailfishOS-$RELEASE /tooling-i486.tar ;\
- sudo rm -f /tooling-i486.tar ;\
- sudo rm -rf /var/cache/zypp/*
+RUN <<EOF
+set -ex
+sudo mkdir /host_targets
+sudo ssu lr
+sudo zypper ref
+sdk-assistant -y create SailfishOS-$RELEASE /tooling-i486.tar
+sudo rm -f /tooling-i486.tar
+sudo rm -rf /var/cache/zypp/*
+EOF

platformsdk.ks

@@ -67,7 +67,9 @@ fi
 ssu mode 4
 ### end 60_ssu
 ### begin 70_sdk-domain
-ssu domain sailfish
+ssu domain sales
+ssu set secureRepoBaseURL releases.jolla.com
+ssu ur
 ### end 70_sdk-domain
 ### begin 90_accept_unsigned_packages
 sed -i /etc/zypp/zypp.conf \