From 066c3f9df5a8e305665be9a2c129b6a8d7eada6c Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 30 Jan 2025 21:18:22 +0300
Subject: [PATCH] Try using s3cmd for macOS

---
 .gitlab-ci.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63c650945c8..f21a0a147f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -503,7 +503,6 @@ Ubuntu_GCC_integration_tests_asan:
     - ccache/
   script:
     - CI/before_install.osx.sh
-    - brew install awscli@2.22.35
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
     - mkdir -pv "${CCACHE_DIR}"
@@ -511,12 +510,23 @@ Ubuntu_GCC_integration_tests_asan:
     - CI/before_script.osx.sh
     - cd build; make -j $(sysctl -n hw.logicalcpu) package
     - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
-    - aws --version
+    - brew install s3cmd
+    - s3cmd --version
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
+        # Configure s3cmd
+        cat > ~/.s3cfg << EOF
+        [default]
+        access_key = ${AWS_ACCESS_KEY_ID}
+        secret_key = ${AWS_SECRET_ACCESS_KEY}
+        host_base = rgw.ctrl-c.liu.se
+        host_bucket = %(bucket)s.rgw.ctrl-c.liu.se
+        use_https = True
+        EOF
+
         artifactDirectory="${CI_PROJECT_NAMESPACE//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_REF_NAME//[\"<>|$'\t'\/\\?*]/_}/${CI_COMMIT_SHORT_SHA//[\"<>|$'\t'\/\\?*]/_}-${CI_JOB_ID//[\"<>|$'\t'\/\\?*]/_}/"
         for dmg in *.dmg; do
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "${dmg}" s3://openmw-artifacts/${artifactDirectory}
+          s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}/
         done
       fi
     - ccache -s