Skip to content

Commit

Permalink
Replace awscli with s3cmd for macOS
Browse files Browse the repository at this point in the history
Homebrew doesn't let us downgrade, we have to use an alternative client (for now)
  • Loading branch information
Capostrophic committed Jan 30, 2025
1 parent 9ae12ba commit 4c95e91
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,20 +503,25 @@ Ubuntu_GCC_integration_tests_asan:
- ccache/
script:
- CI/before_install.osx.sh
- brew install [email protected]
- export CCACHE_BASEDIR="$(pwd)"
- export CCACHE_DIR="$(pwd)/ccache"
- mkdir -pv "${CCACHE_DIR}"
- ccache -z -M "${CCACHE_SIZE}"
- 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
Expand Down
2 changes: 1 addition & 1 deletion CI/before_install.osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4c95e91

Please sign in to comment.