소스 검색

ci(linux): add detail to error [skip ci]

Baptiste Augrain 1 년 전
부모
커밋
5427f5c36a
3개의 변경된 파일16개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      .github/workflows/insider-linux.yml
  2. 14 0
      patches/linux/verify-glibc.patch
  3. 0 2
      prepare_vscode.sh

+ 2 - 2
.github/workflows/insider-linux.yml

@@ -42,8 +42,8 @@ jobs:
           npm_arch: arm64
         - vscode_arch: armhf
           npm_arch: arm
-        - vscode_arch: ppc64le
-          npm_arch: ppc64
+        # - vscode_arch: ppc64le
+        #   npm_arch: ppc64
     env:
       DISABLE_UPDATE: 'yes'
       VSCODE_ARCH: ${{ matrix.vscode_arch }}

+ 14 - 0
patches/linux/verify-glibc.patch

@@ -0,0 +1,14 @@
+diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+index f07c0ba..bd9aac1 100755
+--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
++++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+@@ -36,3 +36,3 @@ for file in $files; do
+   if [[ "$glibc_version" != "$EXPECTED_GLIBC_VERSION" ]]; then
+-    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION"
++    echo "Error: File $file has dependency on GLIBC($glibc_version) != $EXPECTED_GLIBC_VERSION"
+     exit 1
+@@ -40,3 +40,3 @@ for file in $files; do
+   if [[ "$glibcxx_version" != "$EXPECTED_GLIBCXX_VERSION" ]]; then
+-    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION"
++    echo "Error: File $file has dependency on GLIBCXX($glibcxx_version) != $EXPECTED_GLIBCXX_VERSION"
+     exit 1

+ 0 - 2
prepare_vscode.sh

@@ -103,8 +103,6 @@ if [[ "${OS_NAME}" == "linux" ]]; then
 
     export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 
-    # export NPM_REGISTRY='https://registry.yarnpkg.com'
-
     for i in {1..5}; do # try 5 times
       yarn --cwd build --frozen-lockfile --check-files && break
       if [[ $i == 3 ]]; then