ci: add build scripts of the clang toolchain for macOS

Author: andreisfr

.gitlab-ci.yml

@@ -4,28 +4,31 @@ stages:
   - test
   - public_deploy
 
-image: ${CI_DOCKER_REGISTRY}/llvm-build:2
+image: ${CI_DOCKER_REGISTRY}/llvm-build:3
 
 variables:
 
   CONF_TARGET: "xtensa-esp32-elf"
   XTENSA_CLANG_TOOLCHAIN: "${CONF_TARGET}-clang"
   PLATFORM_NAME_LINUX: "linux-amd64"
   PLATFORM_NAME_WIN: "win64"
+  PLATFORM_NAME_MACOS: "macos"
 
-  XTENSA_CLANG_TOOLCHAIN_BRANCH: "esp-20210728-r12.0.1"
+  XTENSA_CLANG_TOOLCHAIN_BRANCH: "esp-20210903-r12.0.1"
   GCC_REL_NAME: "gcc8_4_0-esp-2021r1"
-  XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ: "xtensa-esp32-elf-${GCC_REL_NAME}-linux-amd64.tar.gz"
-  XTENSA_GCC_TOOLCHAIN_WIN_ZIP: "xtensa-esp32-elf-${GCC_REL_NAME}-win64.zip"
 
-  ARCHIVE_TOOL_LINUX: "tar cJf"
-  UNARCHIVE_TOOL_LINUX: "tar xf"
+  ARCHIVE_TOOL_LINUX: "tar -cJf"
+  UNARCHIVE_TOOL_LINUX: "tar -xf"
   ARCHIVE_EXT_LINUX: "tar.xz"
 
   ARCHIVE_TOOL_WIN: "zip -9 -r"
   UNARCHIVE_TOOL_WIN: "unzip"
   ARCHIVE_EXT_WIN: "zip"
 
+  ARCHIVE_TOOL_MACOS: "tar -cJf"
+  UNARCHIVE_TOOL_MACOS: "tar -xf"
+  ARCHIVE_EXT_MACOS: "tar.xz"
+
   DIST_DIR: "dist"
 
 .use_ci_tools: &use_ci_tools |
@@ -39,15 +42,6 @@ before_script:
   - *use_ci_tools
   - *add_gitlab_key
 
-.build_template:
-  stage: build
-  tags: [ "amd64", "build" ]
-  artifacts:
-    paths:
-      - ${DIST_DIR}/
-    when: always
-    expire_in: 10 day
-
 # Prepare release name/number
 .get_release_name: &get_release_name |
   # using annotated tags
@@ -62,14 +56,9 @@ before_script:
   echo "ARCHIVE_NAME: $ARCHIVE_NAME"
 
 # Get an existing crosstool-ng build for esp32
-.get_gcc_toolchain_linux: &get_gcc_toolchain_linux |
-  wget https://dl.espressif.com/dl/${XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ}
-  tar -xf ${XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ}
-  mv xtensa-esp32-elf ${XTENSA_CLANG_TOOLCHAIN}
-
-.get_gcc_toolchain_win: &get_gcc_toolchain_win |
-  wget https://dl.espressif.com/dl/${XTENSA_GCC_TOOLCHAIN_WIN_ZIP}
-  unzip ${XTENSA_GCC_TOOLCHAIN_WIN_ZIP}
+.get_gcc_toolchain: &get_gcc_toolchain |
+  wget https://dl.espressif.com/dl/${XTENSA_GCC_TOOLCHAIN}
+  ${UNARCHIVE_TOOL} ${XTENSA_GCC_TOOLCHAIN}
   mv xtensa-esp32-elf ${XTENSA_CLANG_TOOLCHAIN}
 
 .get_clang_toolchain_build_scripts: &get_clang_toolchain_build_scripts |
@@ -87,44 +76,64 @@ before_script:
   mv ${ARCHIVE_NAME} ${DIST_DIR}/
   echo "${ARCHIVE_NAME}" > ${DIST_DIR}/file_${PLATFORM_NAME}_${CONF_TARGET}
 
-build_clang_toolchain_linux:
-  extends: .build_template
+.build_template:
+  stage: build
+  tags: [ "amd64", "build" ]
+  artifacts:
+    paths:
+      - ${DIST_DIR}/
+    when: always
+    expire_in: 10 day
   script:
-    - ARCHIVE_TOOL=${ARCHIVE_TOOL_LINUX}
-    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_LINUX}
-    - ARCHIVE_EXT=${ARCHIVE_EXT_LINUX}
-    - PLATFORM_NAME=${PLATFORM_NAME_LINUX}
     - *get_release_name
-    - *get_gcc_toolchain_linux
+    - *get_gcc_toolchain
     - *fix_origin_remote_for_public
     - *get_clang_toolchain_build_scripts
-    - ./build-toolchain-linux.sh ${XTENSA_CLANG_TOOLCHAIN}
+    - ${BUILD_TOOLCHAIN_CMD} "${XTENSA_CLANG_TOOLCHAIN}"
     - *package_toolchain
 
-build_clang_toolchain_win:
+linux_amd64_build:
   extends: .build_template
-  script:
-    - ARCHIVE_TOOL=${ARCHIVE_TOOL_WIN}
-    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_WIN}
-    - ARCHIVE_EXT=${ARCHIVE_EXT_WIN}
-    - PLATFORM_NAME=${PLATFORM_NAME_WIN}
-    - *get_release_name
-    - *get_gcc_toolchain_win
-    - *fix_origin_remote_for_public
-    - *get_clang_toolchain_build_scripts
-    - ./build-toolchain-win.sh ${XTENSA_CLANG_TOOLCHAIN}
-    - *package_toolchain
-
-testsuite:
+  variables:
+    PLATFORM_NAME: "${PLATFORM_NAME_LINUX}"
+    ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
+    UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
+    ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
+    # a filename was moved here from the global 'variables:' because of GCC_REL_NAME value couldn't be expanded and substituted there
+    XTENSA_GCC_TOOLCHAIN: "xtensa-esp32-elf-${GCC_REL_NAME}-linux-amd64.tar.gz"
+    BUILD_TOOLCHAIN_CMD: "./build-toolchain-linux.sh"
+
+win64_build:
+  extends: .build_template
+  variables:
+    PLATFORM_NAME: "${PLATFORM_NAME_WIN}"
+    ARCHIVE_TOOL: "${ARCHIVE_TOOL_WIN}"
+    UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_WIN}"
+    ARCHIVE_EXT: "${ARCHIVE_EXT_WIN}"
+    XTENSA_GCC_TOOLCHAIN: "xtensa-esp32-elf-${GCC_REL_NAME}-win64.zip"
+    BUILD_TOOLCHAIN_CMD: "./build-toolchain-win.sh"
+
+macos_amd64_build:
+  extends: .build_template
+  variables:
+    PLATFORM_NAME: "${PLATFORM_NAME_MACOS}"
+    ARCHIVE_TOOL: "${ARCHIVE_TOOL_MACOS}"
+    UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_MACOS}"
+    ARCHIVE_EXT: "${ARCHIVE_EXT_MACOS}"
+    XTENSA_GCC_TOOLCHAIN: "xtensa-esp32-elf-${GCC_REL_NAME}-macos.tar.gz"
+    BUILD_TOOLCHAIN_CMD: "./build-toolchain-macos.sh"
+
+linux_amd64_testsuite:
   stage: test
   tags: [ "amd64", "build" ]
   dependencies:
-    - build_clang_toolchain_linux
+    - linux_amd64_build
+  variables:
+    PLATFORM_NAME: "${PLATFORM_NAME_LINUX}"
+    ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
+    UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
+    ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
   script:
-    - ARCHIVE_TOOL=${ARCHIVE_TOOL_LINUX}
-    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_LINUX}
-    - ARCHIVE_EXT=${ARCHIVE_EXT_LINUX}
-    - PLATFORM_NAME=${PLATFORM_NAME_LINUX}
     - *get_release_name
     - ${UNARCHIVE_TOOL} ${DIST_DIR}/${ARCHIVE_NAME}