mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-27 06:11:34 +00:00
[CI] Ccache flow tweak, use forked commands, cd build
This commit is contained in:
parent
adc4698c44
commit
50e3c9d500
3 changed files with 18 additions and 7 deletions
|
@ -508,9 +508,13 @@ Ubuntu_GCC_integration_tests_asan:
|
||||||
- ccache/
|
- ccache/
|
||||||
script:
|
script:
|
||||||
- CI/before_install.macos.sh
|
- CI/before_install.macos.sh
|
||||||
|
- export CCACHE_BASEDIR="$(pwd)"
|
||||||
|
- export CCACHE_DIR="$(pwd)/ccache"
|
||||||
|
- mkdir -pv "${CCACHE_DIR}"
|
||||||
- CI/macos/ccache_prep.sh
|
- CI/macos/ccache_prep.sh
|
||||||
- CI/before_script.macos.sh
|
- CI/before_script.macos.sh
|
||||||
- CI/macos/build.sh
|
- CI/macos/build.sh
|
||||||
|
- cd build
|
||||||
- for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${DMG_IDENTIFIER}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
|
- for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${DMG_IDENTIFIER}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
|
||||||
- |
|
- |
|
||||||
if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
|
if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
|
||||||
|
@ -526,7 +530,7 @@ Ubuntu_GCC_integration_tests_asan:
|
||||||
s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
|
s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
- ccache -s
|
- CI/macos/ccache_save.sh
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- build/OpenMW-*.dmg
|
- build/OpenMW-*.dmg
|
||||||
|
@ -537,7 +541,7 @@ macOS14_Xcode15_amd64:
|
||||||
tags:
|
tags:
|
||||||
- saas-macos-medium-m1
|
- saas-macos-medium-m1
|
||||||
cache:
|
cache:
|
||||||
key: macOS14_Xcode15_amd64.v1
|
key: macOS14_Xcode15_amd64.v2
|
||||||
variables:
|
variables:
|
||||||
CCACHE_SIZE: 3G
|
CCACHE_SIZE: 3G
|
||||||
DMG_IDENTIFIER: amd64
|
DMG_IDENTIFIER: amd64
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh -ex
|
#!/bin/sh -ex
|
||||||
|
|
||||||
export CCACHE_BASEDIR="$(pwd)"
|
if [[ "${MACOS_AMD64}" ]]; then
|
||||||
export CCACHE_DIR="$(pwd)/ccache"
|
arch -x86_64 ccache -z -M "${CCACHE_SIZE}"
|
||||||
mkdir -pv "${CCACHE_DIR}"
|
else
|
||||||
|
ccache -z -M "${CCACHE_SIZE}"
|
||||||
ccache -z -M "${CCACHE_SIZE}"
|
fi
|
||||||
|
|
7
CI/macos/ccache_save.sh
Executable file
7
CI/macos/ccache_save.sh
Executable file
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/sh -ex
|
||||||
|
|
||||||
|
if [[ "${MACOS_AMD64}" ]]; then
|
||||||
|
arch -x86_64 ccache -s
|
||||||
|
else
|
||||||
|
ccache -s
|
||||||
|
fi
|
Loading…
Reference in a new issue