Add support for Linux s390x.

.github/workflows/ci.yml

@@ -42,6 +42,10 @@ jobs:
             name: Linux armv7l (musl)
             cross-target: armv7-unknown-linux-musleabihf
             docker-platform: linux/arm/v7
+          - os: ubuntu-24.04
+            name: Linux s390x
+            cross-target: s390x-unknown-linux-gnu
+            docker-platform: linux/s390x
           - os: macos-13
             name: macOS x86-64
           - os: macos-14

.github/workflows/release.yml

@@ -57,6 +57,9 @@ jobs:
           - os: ubuntu-24.04
             name: Linux armv7l
             cross-target: armv7-unknown-linux-musleabihf
+          - os: ubuntu-24.04
+            name: Linux s390x
+            cross-target: s390x-unknown-linux-gnu
           - os: macos-13
             name: macOS x86-64
           - os: macos-14

CHANGES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.4.0
+
+This release adds support for Linux s390x.
+
 ## 1.3.0
 
 This release adds support for Linux ARM (armv7l and armv8l 32 bit mode).

Cargo.toml

@@ -5,7 +5,7 @@ members = [
 
 [package]
 name = "scie-jump"
-version = "1.3.0"
+version = "1.4.0"
 description = "The self contained interpreted executable launcher."
 authors = [
     "John Sirois <[email protected]>",

docs/packaging.md

@@ -407,7 +407,8 @@ Further placeholders you can use in command "exe", "args" and "env" values inclu
 + `{scie.lift}`: This expands to the path to the lift manifest, which is extracted to disk when you
   use this placeholder. This can be used to read custom metadata stored in the lift manifest.
 + `{scie.platform}`: The `<OS>-<ARCH>` value for the current platform where `<OS>` is one of
-  `linux`, `macos` or `windows` and `<ARCH>` is either `armv7l` (Linux only), `aarch64` or `x86_64`.
+  `linux`, `macos` or `windows` and `<ARCH>` is either `s390x` (Linux only), `armv7l` (Linux only),
+  `aarch64` or `x86_64`.
 + `{scie.platform.arch}`: The current chip architecture as described by `<ARCH>` above.
 + `{scie.platform.os}`: The current operating system as described by `<OS>` above.
 + `{scie.user.cache_dir=<fallback>}`: The default user cache dir or `<fallback>` if there is none.

examples/README.md

@@ -17,10 +17,11 @@ this sort of artifact.
 
 The `run.sh` script then looks for the default lift manifest for the example. The default lift
 manifest is named `lift.<os>-<arch>.json` in the example directory where `<os>` is currently one of
-`linux`, `macos` or `windows` and `<arch>` is currently one of `armv7l` (Linux only), `aarch64` or `x86_64`. If that lift
-manifest has a top-level "fetch" key, it's expected to have a list of URL string values and all of
-those will be fetched. Use this facility when writing a new example to ensure platform-specific
-artifacts are fetched - typically the interpreter distribution being used by the example.
+`linux`, `macos` or `windows` and `<arch>` is currently one of `s390x` (Linux only), `armv7l` (Linux
+only), `aarch64` or `x86_64`. If that lift manifest has a top-level "fetch" key, it's expected to
+have a list of URL string values and all of those will be fetched. Use this facility when writing a
+new example to ensure platform-specific artifacts are fetched - typically the interpreter
+distribution being used by the example.
 
 Inside the example's directory there should be a `test.sh` bash script that need not be executable.
 It will be run by the `run.sh` script using `bash -eou pipefail test.sh` with the example's

examples/busybox/default-only-lift.linux-s390x.json

@@ -0,0 +1,21 @@
+{
+  "scie": {
+    "lift": {
+      "name": "default-only",
+      "boot": {
+        "commands": {
+          "": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "import sys; print('.'.join(map(str, sys.version_info[:3])))"]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz",
+          "key": "cpython"
+        }
+      ]
+    }
+  }
+}

examples/busybox/lift.linux-s390x.json

@@ -0,0 +1,18 @@
+{
+  "scie": {
+    "lift": {
+      "name": "no-commands",
+      "boot": {
+        "commands": {}
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz"
+        }
+      ]
+    }
+  },
+  "fetch": [
+    "https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz"
+  ]
+}

examples/busybox/mixed-no-default-desc-lift.linux-s390x.json

@@ -0,0 +1,36 @@
+{
+  "scie": {
+    "lift": {
+      "name": "mixed-no-default-desc",
+      "description": "The scie's overall description.",
+      "boot": {
+        "commands": {
+          "": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "import sys; print('.'.join(map(str, sys.version_info[:3])))"]
+          },
+          "foo": {
+            "description": "Prints foo.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('foo')"]
+          },
+          "bar": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('bar')"]
+          },
+          "runs-baz": {
+            "description": "Runs baz.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('ran baz')"]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz",
+          "key": "cpython"
+        }
+      ]
+    }
+  }
+}

examples/busybox/mixed-with-default-desc-lift.linux-s390x.json

@@ -0,0 +1,37 @@
+{
+  "scie": {
+    "lift": {
+      "name": "mixed-with-default-desc",
+      "description": "The scie's overall description.",
+      "boot": {
+        "commands": {
+          "": {
+            "description": "Prints the Python version.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "import sys; print('.'.join(map(str, sys.version_info[:3])))"]
+          },
+          "foo": {
+            "description": "Prints foo.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('foo')"]
+          },
+          "bar": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('bar')"]
+          },
+          "runs-baz": {
+            "description": "Runs baz.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('ran baz')"]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz",
+          "key": "cpython"
+        }
+      ]
+    }
+  }
+}

examples/busybox/named-commands-only-no-desc-lift.linux-s390x.json

@@ -0,0 +1,25 @@
+{
+  "scie": {
+    "lift": {
+      "name": "named-commands-only-no-desc",
+      "boot": {
+        "commands": {
+          "foo": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('foo')"]
+          },
+          "bar": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('bar')"]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz",
+          "key": "cpython"
+        }
+      ]
+    }
+  }
+}

examples/busybox/named-commands-only-with-desc-lift.linux-s390x.json

@@ -0,0 +1,31 @@
+{
+  "scie": {
+    "lift": {
+      "name": "named-commands-only-with-desc",
+      "boot": {
+        "commands": {
+          "foo": {
+            "description": "Prints foo.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('foo')"]
+          },
+          "bar": {
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('bar')"]
+          },
+          "runs-baz": {
+            "description": "Runs baz.",
+            "exe": "{cpython}/python/bin/python3.11",
+            "args": ["-c", "print('ran baz')"]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "cpython-3.11.11+20241206-s390x-unknown-linux-gnu-install_only_stripped.tar.gz",
+          "key": "cpython"
+        }
+      ]
+    }
+  }
+}

examples/run.sh

@@ -49,6 +49,8 @@ function calculate_arch() {
     echo aarch64
   elif [[ "${arch}" =~ armv8l|armv7l ]]; then
     echo armv7l
+  elif [[ "${arch}" == "s390x" ]]; then
+    echo s390x
   else
     die "Integration tests are not supported for this chip architecture (${arch})."
   fi