heredoc

CODeRUS · Jan 6, 2025 · 51e34ee · 51e34ee
1 parent 543adee
commit 51e34ee
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 env:
-  RELEASE: 3.4.0.24
+  RELEASE: 4.6.0.13
 
 jobs:
   build:

diff --git a/Dockerfile.arch b/Dockerfile.arch
@@ -6,9 +6,14 @@ 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
+ssu fl
+ssu domain
+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
diff --git a/Dockerfile.tooling b/Dockerfile.tooling
@@ -8,9 +8,17 @@ 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
+ssu fl
+ssu domain
+ssu release
+ssu lr
+ssu fl release
+ssu domain sailfish
+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
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ on: @@
           - master
     env:
-      RELEASE: 3.4.0.24
+      RELEASE: 4.6.0.13
     jobs:
       build:
@@ Expand Down @@