1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-14 10:21:09 +00:00

Replace awscli with s3cmd for macOS

Homebrew doesn't let us downgrade, we have to use an alternative client (for now)
This commit is contained in:
Alexei Kotov 2025-01-31 00:59:50 +03:00
parent 9ae12baee1
commit 4c95e91a8d
2 changed files with 9 additions and 4 deletions

View File

@ -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,18 @@ 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
- |
if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
echo "[default]" > ~/.s3cfg
echo "access_key = ${AWS_ACCESS_KEY_ID}" >> ~/.s3cfg
echo "secret_key = ${AWS_SECRET_ACCESS_KEY}" >> ~/.s3cfg
echo "host_base = rgw.ctrl-c.liu.se" >> ~/.s3cfg
echo "host_bucket = %(bucket)s.rgw.ctrl-c.liu.se" >> ~/.s3cfg
echo "use_https = True" >> ~/.s3cfg
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

View File

@ -7,7 +7,7 @@ export HOMEBREW_AUTOREMOVE=1
brew tap --repair
brew update --quiet
brew install curl xquartz gd fontconfig freetype harfbuzz brotli
brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd
command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake