Generate pkg package for m1

VirtusLab · Sep 30, 2022 · cfb062a · cfb062a
1 parent b2f7ee1
commit cfb062a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.github/scripts/generate-os-packages.sh b/.github/scripts/generate-os-packages.sh
@@ -65,11 +65,12 @@ generate_rpm() {
 }
 
 generate_pkg() {
+  arch=$1
   packager \
     --pkg \
     --version "$(version)" \
     --source-app-path "$(launcher)" \
-    --output "$ARTIFACTS_DIR/scala-cli-x86_64-apple-darwin.pkg" \
+    --output "$ARTIFACTS_DIR/scala-cli-$arch-apple-darwin.pkg" \
     --identifier "scala-cli" \
     --launcher-app "scala-cli"
 }
@@ -129,13 +130,18 @@ generate_sdk() {
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
   generate_deb
   generate_rpm
+  generate_sdk
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-  generate_pkg
+  if [ "$(uname -m)" == "aarch64" ]; then
+    generate_pkg "aarch64"
+  else
+    generate_pkg "x86_64"
+    generate_sdk
+  fi
 elif [[ "$OSTYPE" == "msys" ]]; then
   generate_msi
+  generate_sdk
 else
   echo "Unrecognized operating system: $OSTYPE" 1>&2
   exit 1
 fi
-
-generate_sdk
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -300,10 +300,10 @@ jobs:
           jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
       - name: Generate native launcher
         run: .github/scripts/generate-native-image.sh
-      #      - run: ./mill -i ci.setShouldPublish
-      #      - name: Build OS packages TODO generate os packages for M1
-      #        if: env.SHOULD_PUBLISH == 'true'
-      #        run: .github/scripts/generate-os-packages.sh
+      - run: ./mill -i ci.setShouldPublish
+      - name: Build OS packages TODO generate os packages for M1
+        if: env.SHOULD_PUBLISH == 'true'
+        run: .github/scripts/generate-os-packages.sh
       - name: Copy artifacts
         run: ./mill -i copyDefaultLauncher artifacts/
       - uses: actions/upload-artifact@v3

diff --git a/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala b/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala
@@ -48,7 +48,7 @@ class NativePackagerTests extends ScalaCliSuite {
         val pkgAppPath = root / pkgAppFile
         expect(os.isFile(pkgAppPath))
 
-        if (TestUtil.isCI && !TestUtil.isArmArchitecture) {
+        if (TestUtil.isCI) {
           os.proc("installer", "-pkg", pkgAppFile, "-target", "CurrentUserHomeDirectory").call(
             cwd = root,
             stdin = os.Inherit,

diff --git a/modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala b/modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala
@@ -3,7 +3,6 @@ package scala.cli.integration
 import os.{CommandResult, Path}
 
 import java.io.File
-import java.util.Locale
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.{ExecutorService, Executors, ScheduledExecutorService, ThreadFactory}
 
@@ -21,9 +20,6 @@ object TestUtil {
   val detectCliPath                = if (TestUtil.isNativeCli) TestUtil.cliPath else "scala-cli"
   val cli: Seq[String]             = cliCommand(cliPath)
 
-  lazy val isArmArchitecture: Boolean =
-    sys.props.getOrElse("os.arch", "").toLowerCase(Locale.ROOT) == "aarch64"
-
   def cliCommand(cliPath: String): Seq[String] =
     if (isNativeCli)
       Seq(cliPath)