Merge branch 'topic/gh_mac_os_m1' into 'master'

Build binaries for Mac OS M1 on GitHub Action

See merge request eng/ide/ada_language_server!1456

Author: reznikmm

.github/workflows/build-binaries.sh

@@ -10,7 +10,12 @@ NO_REBASE=$4 # Specify this to skip the rebase over the edge branch. Used for lo
 CROSS=$5 # '' for native, aarch64 for ARM cross
 
 prefix=/tmp/ADALIB_DIR
-TARGET=${CROSS:+$CROSS-linux} # '' or aarch64-linux
+if [ $RUNNER_OS = Linux ] ; then
+  TARGET=${CROSS:+$CROSS-linux} # '' or aarch64-linux
+else
+  TARGET=${CROSS:+$CROSS-darwin} # '' or aarch64-darwin
+fi
+
 TARGET_OPTION=${TARGET:+--target=$TARGET}  # '' or --target=aarch64-linux
 
 export CPATH=/usr/local/include
@@ -114,7 +119,7 @@ function fix_rpath ()
 
 ALS_EXEC_DIR=integration/vscode/ada/$NODE_ARCH/$NODE_PLATFORM
 
-if [ $RUNNER_OS = macOS ]; then
+if [ $RUNNER_OS = macOS -a -z "$CROSS" ]; then
     cp -v -f /usr/local/opt/gmp/lib/libgmp.10.dylib $ALS_EXEC_DIR
     fix_rpath $ALS_EXEC_DIR/ada_language_server
 fi

.github/workflows/build-binaries.yml

@@ -20,8 +20,6 @@ jobs:
         exclude:
           - os: windows-latest
             cross: aarch64
-          - os: macos-11
-            cross: aarch64
     runs-on: ${{ matrix.os }}
     steps:
       - name: Setup Python
@@ -37,18 +35,29 @@ jobs:
           else
               echo "TAG=$DEFAULT_TAG" >> $GITHUB_ENV
           fi
-      - name: Unpack cross toolchain from AWS S3
-        if: ${{ matrix.cross != '' }}
+      - name: Install cross toolchain (Linux)
+        if: ${{ matrix.cross != '' && runner.os == 'Linux' }}
         env:
           AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
           AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
           AWS_DEFAULT_REGION: eu-west-1
         run: |
-            aws s3 cp s3://adacore-gha-tray-eu-west-1/libadalang/${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2 . --sse=AES256
-            aws s3 cp s3://adacore-gha-tray-eu-west-1/libadalang/${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 . --sse=AES256
             sudo apt install -y libc6-dev-arm64-cross linux-libc-dev-arm64-cross binutils-aarch64-linux-gnu
-            sudo tar xavf ${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2 -C /
-            sudo tar xavf ${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 -C /
+            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2 . --sse=AES256
+            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 . --sse=AES256
+            sudo tar xjf ${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2  -C /
+            sudo tar xjf ${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 -C /
+      - name: Install cross toolchain (MacOS)
+        if: ${{ matrix.cross != '' && runner.os != 'Linux' }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
+          AWS_DEFAULT_REGION: eu-west-1
+        run: |
+            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2 . --sse=AES256
+            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 . --sse=AES256
+            sudo tar xjf ${{ matrix.cross }}-${{ runner.os }}-gcc-13.2.tar.bz2  --strip-components=3 -C /usr/local
+            sudo tar xjf ${{ matrix.cross }}-${{ runner.os }}-gmp-6.2.1.tar.bz2 --strip-components=3 -C /usr/local
       - name: Force Alire use preinstalled MSYS2
         shell: bash
         if: ${{ runner.os == 'Windows' }}

.github/workflows/pack-binaries.sh

@@ -17,13 +17,13 @@ function make_change_log()
     done
 }
 
-chmod -R -v +x als-*-$DEBUG als-Linux-${DEBUG}aarch64
+chmod -R -v +x als-*-$DEBUG als-{Linux,macOS}-${DEBUG}aarch64
 
 for X in Linux macOS Windows ; do
     rsync -rva als-$X-$DEBUG/ integration/vscode/ada/
 done
 
-rsync -rva als-Linux-${DEBUG}aarch64/ integration/vscode/ada/
+rsync -rva als-{Linux,macOS}-${DEBUG}aarch64/ integration/vscode/ada/
 
 # VS Code is supported on arm, arm64 and x64 so we only consider those
 # architectures

.github/workflows/release.sh

@@ -38,9 +38,10 @@ echo "upload_url=$upload_url"
 
 chmod -R -v +x als-*-$DEBUG
 
+for CROSS in "" "aarch64" ; do
 for X in Linux macOS Windows ; do
-  FILE=als-$TAG-$X${DEBUG:+-debug}_amd64.zip
-  cd als-$X-$DEBUG
+  FILE=als-$TAG-$X${DEBUG:+-debug}_${CROSS:-amd64}.zip
+  cd als-$X-$DEBUG$CROSS
   zip -9 -r ../$FILE .
   cd ..
 
@@ -54,3 +55,4 @@ for X in Linux macOS Windows ; do
     $upload_url?name=$FILE
   rm -v -f $FILE
 done
+done