esp/ci: Fixes Windows release archives

Author: gerekon

.gitlab-ci.yml

@@ -15,14 +15,11 @@ variables:
   CLANG_VER: "15.0.0"
   GCC_REL_NAME: "esp-2022r1"
   GCC_REL_VER: "gcc11_2_0"
-  NEWLIB_REPO: "newlib-cygwin"
   NEWLIB_REF: "esp-2022r1"
-  BINUTILS_REPO: "binutils-gdb"
   BINUTILS_REF: "esp-2022r1-binutils"
-  XTENSA_OVERLAYS_REPO: "xtensa-overlays"
   XTENSA_OVERLAYS_REF: "master"
-  LLVM_GCC_TESTSUITE_REF: "release_universal_clang_toolchain"
-  XTENSA_CLANG_TOOLCHAIN_REF: "release_universal_clang_toolchain"
+  LLVM_GCC_TESTSUITE_REF: "esp-15.0.0-20221201"
+  XTENSA_CLANG_TOOLCHAIN_REF: "esp-15.0.0-20221201"
 
   CROSS_ARM_IMAGE: $CI_DOCKER_REGISTRY/llvm-build-cross-arm:1
   PLATFORM_NAME_LINUX: "linux-amd64"
@@ -39,10 +36,10 @@ variables:
   ARCHIVE_TOOL_WIN: "zip -9 -r"
   UNARCHIVE_TOOL_WIN: "unzip"
   ARCHIVE_EXT_WIN: "zip"
-  # Use Linux xz compressor to minimize Windows build artifact size.
-  # Upon release archive will be re-packed into zip format for uploading to GH.
-  ARCHIVE_TOOL_WIN_INT: ${ARCHIVE_TOOL_LINUX}
-  UNARCHIVE_TOOL_WIN_INT: ${UNARCHIVE_TOOL_LINUX}
+
+  PACK_ARCHIVE_TOOL_WIN: "tar -h -cJf"
+  PACK_UNARCHIVE_TOOL_WIN: "${UNARCHIVE_TOOL_LINUX}"
+  PACK_ARCHIVE_EXT_WIN: "${ARCHIVE_EXT_LINUX}"
 
   ARCHIVE_TOOL_MACOS: "tar -cJf"
   UNARCHIVE_TOOL_MACOS: "tar -xf"
@@ -52,10 +49,6 @@ variables:
   UNARCHIVE_TOOL_NEWLIB: ${UNARCHIVE_TOOL_LINUX}
   ARCHIVE_EXT_NEWLIB: ${ARCHIVE_EXT_LINUX}
 
-  LIBS_ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
-  LIBS_UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
-  LIBS_ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
-
   DIST_DIR: "dist"
   BUILD_DIR: "build"
   DOWNLOADS_DIR: "downloads"

.legacy-release.yml

@@ -104,11 +104,11 @@ linux_amd64_testsuite:
     - ${UNARCHIVE_TOOL} ${DIST_DIR}/${ARCHIVE_NAME}
 
     # getting testsuite
-    - git clone -b ${LLVM_GCC_TESTSUITE_REF} --depth 1 $GITLAB_SSH_SERVER/idf/llvm-xtensa-testsuite.git
+    - git clone -b ${LLVM_GCC_TESTSUITE_REF} --depth 1 $GITLAB_SSH_SERVER/idf/${LLVM_TESTSUITE_REPO}.git
 
     # preparing testsuite
     - export PATH=${PWD}/${XTENSA_CLANG_TOOLCHAIN}/bin/:$PATH
-    - cd llvm-xtensa-testsuite
+    - cd ${LLVM_TESTSUITE_REPO}
 
     # qemu
     - ./qemu_esp32_install.sh

.universal-toolchain-release.yml

@@ -5,7 +5,7 @@
   REL_NUM=$(git describe --abbrev=7)
   REL_NAME=${REL_SFX}-${REL_NUM}-${PLATFORM_NAME}
   ARCHIVE_NAME=${REL_NAME}.${ARCHIVE_EXT}
-  LIBS_ARCHIVE_NAME=libs_${REL_NAME}.${LIBS_ARCHIVE_EXT}
+  LIBS_ARCHIVE_NAME=libs_${REL_NAME}.${ARCHIVE_EXT}
   echo "PLATFORM_NAME: $PLATFORM_NAME"
   echo "REL_NUM: $REL_NUM"
   echo "REL_NAME: $REL_NAME"
@@ -35,7 +35,7 @@
 
 # Pack libs to be used for Rust, Go etc.
 .package_libs: &package_libs |
-  ${LIBS_ARCHIVE_TOOL} ${LIBS_ARCHIVE_NAME} esp-clang/lib/libclang* esp-clang/lib/clang/${CLANG_VER}/include
+  eval ${ARCHIVE_TOOL} ${LIBS_ARCHIVE_NAME} esp-clang/lib/clang/${CLANG_VER}/include esp-clang/lib/lib{clang,LLVM}* ${LIBS_PACK_EXTRA_PATHS:-}
   mkdir -p ${DISTRO_DIR}
   mv ${LIBS_ARCHIVE_NAME} ${DISTRO_DIR}/
   echo "${LIBS_ARCHIVE_NAME}" > ${DISTRO_DIR}/file_libs-${PLATFORM_NAME}
@@ -254,9 +254,6 @@ build_newlib:
     ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
     UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
     ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
-    LIBS_ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
-    LIBS_UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
-    LIBS_ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
 
 pack_x86_64-linux-gnu:
   extends: .pack_linux-gnu_template
@@ -295,22 +292,17 @@ pack_x86_64-w64-mingw32:
   variables:
     CONF_HOST: "x86_64-w64-mingw32"
     PLATFORM_NAME: "${PLATFORM_NAME_WIN}"
-    ARCHIVE_TOOL: "${ARCHIVE_TOOL_LINUX}"
-    UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_LINUX}"
-    ARCHIVE_EXT: "${ARCHIVE_EXT_LINUX}"
-    LIBS_ARCHIVE_TOOL: "${ARCHIVE_TOOL_WIN}"
-    LIBS_UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_WIN}"
-    LIBS_ARCHIVE_EXT: "${ARCHIVE_EXT_WIN}"
+    ARCHIVE_TOOL: "${PACK_ARCHIVE_TOOL_WIN}"
+    UNARCHIVE_TOOL: "${PACK_UNARCHIVE_TOOL_WIN}"
+    ARCHIVE_EXT: "${PACK_ARCHIVE_EXT_WIN}"
+    LIBS_PACK_EXTRA_PATHS: esp-clang/bin/lib{c++,clang,LLVM,unwind}*
 
 .pack_apple-darwin_template:
   extends: .pack_template
   variables:
     ARCHIVE_TOOL: "${ARCHIVE_TOOL_MACOS}"
     UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_MACOS}"
     ARCHIVE_EXT: "${ARCHIVE_EXT_MACOS}"
-    LIBS_ARCHIVE_TOOL: "${ARCHIVE_TOOL_MACOS}"
-    LIBS_UNARCHIVE_TOOL: "${UNARCHIVE_TOOL_MACOS}"
-    LIBS_ARCHIVE_EXT: "${ARCHIVE_EXT_MACOS}"
 
 pack_x86_64-apple-darwin:
   extends: .pack_apple-darwin_template
@@ -344,10 +336,10 @@ test_x86_64-linux-gnu:
     - *get_release_name
     - ${UNARCHIVE_TOOL} ${DIST_DIR}/${ARCHIVE_NAME}
     # getting testsuite
-    - git clone -b ${LLVM_GCC_TESTSUITE_REF} --depth 1 $GITLAB_SSH_SERVER/idf/llvm-xtensa-testsuite.git
+    - git clone -b ${LLVM_GCC_TESTSUITE_REF} --depth 1 $GITLAB_SSH_SERVER/idf/${LLVM_TESTSUITE_REPO}.git
     # preparing testsuite
     - export PATH=${PWD}/esp-clang/bin:$PATH
-    - cd llvm-xtensa-testsuite
+    - cd ${LLVM_TESTSUITE_REPO}
     # qemu
     - ./qemu_esp32_install.sh
     # run testsuite for esp32