Skip to content

Commit 14b9f55

Browse files
committed
esp/ci: Update libs ditro in IDF
1 parent 09df635 commit 14b9f55

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,6 @@ upload_to_http:
553553
printf "# %s: %s bytes\n" "${n}" "${sz}" >> ${SHA256_FILE};
554554
sha256sum -b "${n}" >> ${SHA256_FILE};
555555
done
556-
# Append FILES with checksum file
557-
FILES=$(echo -e "${FILES}\n${SHA256_FILE}")
558-
ls -l ${FILES}
559556

560557
upload_to_github:
561558
stage: public_deploy
@@ -570,8 +567,6 @@ upload_to_github:
570567
GITHUB_TOKEN: "${GH_TOKEN}"
571568
GITHUB_REPO: "${GH_REPO_HTTPS}"
572569
TAG: "${CI_COMMIT_TAG}"
573-
TOOLCHAIN_SHA256_FILE: clang-${CI_COMMIT_TAG}-checksum.sha256
574-
LIBS_SHA256_FILE: libs-clang-${CI_COMMIT_TAG}-checksum.sha256
575570
needs:
576571
- job: build_x86_64-linux-gnu
577572
- job: pack_arm-linux-gnueabihf
@@ -588,14 +583,14 @@ upload_to_github:
588583
# Generate checksum file for toolchain
589584
# List of archives
590585
- FILES=$(find ${PWD} -name dist_name_\* -exec cat {} \+)
591-
- SHA256_FILE=${TOOLCHAIN_SHA256_FILE}
586+
- SHA256_FILE=clang-${CI_COMMIT_TAG}-checksum.sha256
592587
- *gen_checksum_file
593588
- DIST_FILES=${FILES}
594589
# Generate checksum file for standalone libraries
595590
- FILES=$(find ${PWD} -name libs_dist_name_\* -exec cat {} \+)
596-
- SHA256_FILE=${LIBS_SHA256_FILE}
597591
- *gen_checksum_file
598-
- DIST_FILES=$(echo -e "${DIST_FILES}\n${FILES}")
592+
# Append FILES with checksum file
593+
- DIST_FILES=$(echo -e "${DIST_FILES}\n${FILES}\n${SHA256_FILE}")
599594
- ls -l ${DIST_FILES}
600595
# Upload archives
601596
- for n in ${DIST_FILES}; do hub release edit -m "" -a "${n}" "${TAG}"; done
@@ -608,9 +603,11 @@ update_idf_tools:
608603
- tags
609604
variables:
610605
TOOL_NAME: esp-clang
611-
TOOL_MEMBERS: esp-clang
606+
TOOL_MEMBERS: "esp-clang esp-clang-libs"
612607
TOOL_VERSION: ${CI_COMMIT_TAG}
613608
TOOL_SHA256_URL: https://github.com/espressif/llvm-project/releases/download/${CI_COMMIT_TAG}/clang-${CI_COMMIT_TAG}-checksum.sha256
609+
esp_clang_EXTRA_OPTS: "--dist-filename-prefix clang-esp"
610+
esp_clang_libs_EXTRA_OPTS: "--dist-filename-prefix libs-clang-esp"
614611
RN_SECTION: Toolchain
615612
trigger:
616613
project: idf/idf-tools-updater

0 commit comments

Comments
 (0)