From 416854aacf2b32d2e69b897ed2226bbf0b2a4758 Mon Sep 17 00:00:00 2001 From: Melvin Lathara Date: Tue, 3 Jun 2025 16:52:57 -0700 Subject: [PATCH 1/3] use repo secrets for aws credentials --- .github/scripts/aws.tar.gpg | Bin 382 -> 0 bytes .github/scripts/install_aws.sh | 3 --- .github/workflows/basic.yml | 4 +++- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .github/scripts/aws.tar.gpg diff --git a/.github/scripts/aws.tar.gpg b/.github/scripts/aws.tar.gpg deleted file mode 100644 index 382e6faa505c25968424696680742fc6945ef0b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmV-^0fGLE4Fm}T0t=bk4)D@K9(G^QPMQ zs|>s$RYgY#nt5KbN3W9*NRG1!$uzyGRWffNoE20~Rk|8DkyEIi`_4ZvvAnmgj3rC) z#g03Y05w<=bf%Fs#1u;ZhczxJqMmW6uUO!nfv;HpX$9b}=kKJ32(ARJUO<+5J zNNes169S#f5>Z$2&K2U?uh1|s^<;|h`??URs*~bE-?uBHIl#$&Z%pNm@^kBNq_6|p z7_!bj$=t0AL$S?>K*sFiQIVh*$_i3~LAnI<&U>vOWzEYn5j2Vg8;S#?`jYBZiRK|& c6+HpU3O+@yizd9?dzXMpr>0ER6k(VU5!+I|m;e9( diff --git a/.github/scripts/install_aws.sh b/.github/scripts/install_aws.sh index afe59a3f..ca6a111e 100755 --- a/.github/scripts/install_aws.sh +++ b/.github/scripts/install_aws.sh @@ -3,9 +3,6 @@ # Error out on first failure set -e -gpg --quiet --batch --yes --decrypt --passphrase=$AWS_TAR --output ${HOME}/aws.tar $GITHUB_WORKSPACE/.github/scripts/aws.tar.gpg -tar xvf ${HOME}/aws.tar -C $HOME - # Install aws cli for sanity checking if [[ ! -n $(which aws) ]]; then sudo apt-get -q update diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 8d879208..09ae6a7c 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -190,7 +190,9 @@ jobs: R_TAR: ${{secrets.R_NEW_TAR}} AZ_TAR: ${{secrets.AZ_TAR}} AZURITE_TAR: ${{secrets.AZURITE_TAR}} - AWS_TAR: ${{secrets.AWS_TAR}} + AWS_DEFAULT_REGION: ${{vars.AWS_DEFAULT_REGION}} + AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} + AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} - name: Upload Report to CodeCov uses: codecov/codecov-action@v4 From 495316798db9b41ebb2ad15338ca0ce40e0e48c2 Mon Sep 17 00:00:00 2001 From: Melvin Lathara Date: Mon, 15 Sep 2025 15:46:22 -0700 Subject: [PATCH 2/3] ubuntu-22 is deprecated --- .github/workflows/basic.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 09ae6a7c..ce575492 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -49,7 +49,7 @@ jobs: build: strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] # All supported types # type: [basic, basic-no-hdfs, basic-codec, hdfs, gcs, azure, azurite, aws] type: [basic, basic-no-hdfs, basic-codec, hdfs, gcs, azure, aws] @@ -60,16 +60,6 @@ jobs: - os: macos-13 type: basic openssl-version: 3 - - os: ubuntu-22.04 - type: basic - #- os: ubuntu-22.04 - #type: azurite - - os: ubuntu-22.04 - type: aws - - os: ubuntu-22.04 - type: gcs - - os: ubuntu-22.04 - type: azure runs-on: ${{ matrix.os }} From 61fcd60bdffebf687facf470ad3465f402354013 Mon Sep 17 00:00:00 2001 From: Melvin Lathara Date: Mon, 15 Sep 2025 15:59:03 -0700 Subject: [PATCH 3/3] try to pin cmake to 3.31.6 --- .github/workflows/basic.yml | 18 +++++++++++++++++- .github/workflows/valgrind.yml | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index ce575492..499a7750 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -28,6 +28,7 @@ name: build on: push: + branches: [ master, develop ] paths-ignore: - '**/*.md' pull_request: @@ -129,11 +130,26 @@ jobs: shell: bash working-directory: ${{env.CMAKE_BUILD_DIR}} run: | - brew list cmake &>/dev/null || brew install cmake brew list lcov &>/dev/null || brew install lcov brew list openssl@${{matrix.openssl-version}} &>/dev/null || brew install openssl@${{matrix.openssl-version}} brew list ossp-uuid &>/dev/null || brew install ossp-uuid brew list catch2 &>/dev/null || brew install catch2 + # taken from https://github.com/actions/runner-images/pull/12791/files + # Pin cmake to 3.31.6 because 4.x is not backward compatible + brew uninstall cmake &>/dev/null || true + cmake_commit="b4e46db74e74a8c1650b38b1da222284ce1ec5ce" + tap_name="local/pinned" + echo "Creating local tap (no git)..." + brew tap-new --no-git "$tap_name" >/dev/null + cmake_formula_dir="$(brew --repo "$tap_name")/Formula" + mkdir -p "$cmake_formula_dir" + cmake_rb_link="https://raw.githubusercontent.com/Homebrew/homebrew-core/$cmake_commit/Formula/c/cmake.rb" + cmake_rb_path="$cmake_formula_dir/cmake.rb" + echo "Downloading cmake.rb from $cmake_rb_link" + curl -fsSL --retry 3 --retry-delay 5 "$cmake_rb_link" -o "$cmake_rb_path" + echo "Installing cmake 3.31.6 from custom tap..." + brew install "$tap_name/cmake" + cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DAWSSDK_VERSION=$AWSSDK_VER \ -DGCSSDK_VERSION=$GCSSDK_VER # GCS SDK needs OPENSSL_ROOT_DIR set for MAC, so build here diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 67509cdb..0e5412e0 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -28,7 +28,7 @@ name: valgrind on: push: - #branches: [ master, develop ] + branches: [ master, develop ] paths-ignore: - '**/*.md' pull_request: