Enable cross compile builds for s390x and ppc on azure ci

build/build.sh

@@ -11,8 +11,12 @@ main() {
     CARGO="$(builder)"
 
     # Test a normal debug build.
-    if is_arm || is_aarch64; then
+    if is_arm || is_aarch64 || is_ppc64le; then
         "$CARGO" build --target "$TARGET" --release --features 'pcre2'
+    # pcre2 is not supported on s390x
+    # https://github.com/zherczeg/sljit/issues/89
+    elif is_s390x; then
+        "$CARGO" build --release --target=$TARGET
     else
         # Technically, MUSL builds will force PCRE2 to get statically compiled,
         # but we also want PCRE2 statically build for macOS binaries.
@@ -38,14 +42,14 @@ main() {
     # sanity check the file type
     file target/"$TARGET"/release/rg
 
-    # Apparently tests don't work on arm, so just bail now. I guess we provide
-    # ARM releases on a best effort basis?
-    if is_arm || is_aarch64 || is_arm64; then
+    # Apparently tests don't work on arm, s390x and ppc64le so just bail now. I guess we provide
+    # ARM, ppc64le and s390x releases on a best effort basis?
+    if is_arm || is_aarch64 || is_arm64 || is_ppc64le || is_s390x; then
       return 0
     fi
 
     # Run tests for ripgrep and all sub-crates.
     PCRE2_SYS_STATIC=1 "$CARGO" test --target "$TARGET" --release --verbose --all --features 'pcre2'
 }
 
-main
+main

build/install.sh

@@ -60,6 +60,14 @@ install_linux_dependencies() {
     if is_aarch64; then
         sudo apt-get install gcc-aarch64-linux-gnu
     fi
+
+    if is_ppc64le; then
+        sudo apt-get install -y gcc-powerpc64le-linux-gnu
+    fi
+
+    if is_s390x; then
+        sudo apt-get install -y gcc-s390x-linux-gnu
+    fi
 }
 
 configure_cargo() {
@@ -89,4 +97,4 @@ main() {
     configure_cargo
 }
 
-main
+main

build/main.yml

@@ -72,6 +72,20 @@ jobs:
     - template: windows.yml
       parameters:
         target: aarch64-pc-windows-msvc
+- job: ppc64le
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - template: linux.yml
+      parameters:
+        target: powerpc64le-unknown-linux-gnu
+- job: s390x
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - template: linux.yml
+      parameters:
+        target: s390x-unknown-linux-gnu
 - job: publish
   pool:
     vmImage: 'ubuntu-16.04'
@@ -87,6 +101,8 @@ jobs:
   - win_64
   - win_32
   - win_arm64
+  - ppc64le
+  - s390x
   steps:
     - template: publish.yml
 
@@ -96,4 +112,4 @@ trigger:
    - main
   tags:
     include:
-    - v*
+    - v*

build/utils.sh

@@ -38,6 +38,12 @@ architecture() {
         aarch64-apple-darwin)
             echo arm64
             ;;
+        powerpc64le-unknown-linux-gnu)
+            echo ppc64le
+            ;;
+        s390x-unknown-linux-gnu)
+            echo s390x
+            ;;
         *)
             die "architecture: unexpected target $TARGET"
             ;;
@@ -52,6 +58,12 @@ gcc_prefix() {
         aarch64)
             echo aarch64-linux-gnu-
             ;;
+        ppc64le)
+            echo  powerpc64le-linux-gnu-
+	        ;;
+        s390x)
+            echo s390x-linux-gnu-
+	        ;;
         *)
             return
             ;;
@@ -107,6 +119,20 @@ is_arm64() {
     esac
 }
 
+is_ppc64le() {
+    case "$(architecture)" in
+        ppc64le) return 0 ;;
+        *)       return 1 ;;
+    esac
+}	
+
+is_s390x() {
+    case "$(architecture)" in
+        s390x) return 0 ;;
+        *)     return 1 ;;
+    esac
+}
+
 is_linux() {
     case "$AGENT_OS" in
         Linux) return 0 ;;
@@ -128,4 +154,4 @@ builder() {
     else
         echo "cargo"
     fi
-}
+}