From 31f664ca325723b3ed4de351686eec7536976bb1 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 15:50:16 +0800 Subject: [PATCH 1/6] Try to fix cpp IT --- .github/workflows/multi-language-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index ac3f3a63cdb9..a539e45c328e 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -99,7 +99,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: cpp-IT-${{ runner.os }} - path: iotdb-client/client-cpp/target/build/test/Testing + path: distribution/target/apache-iotdb-1.4.0-SNAPSHOT-all-bin/apache-iotdb-1.4.0-SNAPSHOT-all-bin/logs retention-days: 1 go: From 801b688280253f5e8874e90fea8dba9d57d5d839 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 15:51:45 +0800 Subject: [PATCH 2/6] Update multi-language-client.yml --- .github/workflows/multi-language-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index a539e45c328e..47593623cc5c 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -4,6 +4,7 @@ on: branches: - master - "rc/*" + - HTHou-patch-2 paths: - 'pom.xml' - 'iotdb-client/pom.xml' From 1e0b8f918cd606a926149b5b7656bb0753681896 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 16:09:55 +0800 Subject: [PATCH 3/6] Update multi-language-client.yml --- .github/workflows/multi-language-client.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index 47593623cc5c..2f502b75685d 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -61,7 +61,6 @@ jobs: shell: bash run: | brew install boost - brew install bison - name: Install CPP Dependencies (Windows) if: runner.os == 'Windows' run: | @@ -77,7 +76,7 @@ jobs: uses: actions/cache@v4 with: path: ~/.m2 - key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2- - name: Build IoTDB server shell: bash From 116a163f059579de65206a2cd597328729429d02 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 16:19:01 +0800 Subject: [PATCH 4/6] Update multi-language-client.yml --- .github/workflows/multi-language-client.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index 2f502b75685d..6a9b3bffca7c 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -50,6 +50,11 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: corretto + java-version: 17 - name: Install CPP Dependencies (Ubuntu) if: runner.os == 'Linux' shell: bash From 9ac374e8f23a3ae64b43ef0bbc902c5814b7c3a5 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 16:42:10 +0800 Subject: [PATCH 5/6] Update multi-language-client.yml --- .github/workflows/multi-language-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index 6a9b3bffca7c..d75fc9732041 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -50,11 +50,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: corretto - java-version: 17 - name: Install CPP Dependencies (Ubuntu) if: runner.os == 'Linux' shell: bash @@ -66,6 +61,11 @@ jobs: shell: bash run: | brew install boost + sudo rm -rf /Applications/Xcode_14.3.1.app + sudo rm -rf /Applications/Xcode_15.0.1.app + sudo rm -rf /Applications/Xcode_15.1.app + sudo rm -rf /Applications/Xcode_15.2.app + sudo rm -rf /Applications/Xcode_15.3.app - name: Install CPP Dependencies (Windows) if: runner.os == 'Windows' run: | @@ -104,7 +104,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: cpp-IT-${{ runner.os }} - path: distribution/target/apache-iotdb-1.4.0-SNAPSHOT-all-bin/apache-iotdb-1.4.0-SNAPSHOT-all-bin/logs + path: distribution/target/apache-iotdb-*-all-bin/apache-iotdb-*-all-bin/logs retention-days: 1 go: From 8593a9fdf5b713b072057388397820ee20b2f571 Mon Sep 17 00:00:00 2001 From: Haonan Date: Tue, 3 Sep 2024 16:53:07 +0800 Subject: [PATCH 6/6] Update multi-language-client.yml --- .github/workflows/multi-language-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml index d75fc9732041..c3e1ff7ba2a5 100644 --- a/.github/workflows/multi-language-client.yml +++ b/.github/workflows/multi-language-client.yml @@ -4,7 +4,6 @@ on: branches: - master - "rc/*" - - HTHou-patch-2 paths: - 'pom.xml' - 'iotdb-client/pom.xml' @@ -57,6 +56,7 @@ jobs: sudo apt-get update sudo apt-get install libboost-all-dev - name: Install CPP Dependencies (Mac) + # remove some xcode to release disk space if: runner.os == 'macOS' shell: bash run: |