codex-storage
/
nim-codex
mirror of https://github.com/codex-storage/nim-codex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bring feat/chronos-v4 up-to-date with feat/build-improvements

This commit is contained in:
gmega 2024-01-19 19:34:40 -03:00
parent 7540cf3b18
commit e8ad522799
No known key found for this signature in database
GPG Key ID: FFD8DAF00660270F
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/actions/nimbus-build-system/action.yml vendored
View File

@ -150,14 +150,13 @@ runs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: NimBinaries path: NimBinaries
key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-cache-${{ env.cache_nonce }}-${{ github.run_id }} key: ${{ inputs.os }}-${{ inputs.cpu }}-cache-${{ env.cache_nonce }}-${{ github.run_id }}
restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-nim-cache-${{ env.cache_nonce }} restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-cache-${{ env.cache_nonce }}
- name: Build Nim and Codex dependencies - name: Build Nim and Codex dependencies
shell: ${{ inputs.shell }} {0} shell: ${{ inputs.shell }} {0}
run: | run: |
. ./env.sh ./env.sh make -j${ncpu} CI_CACHE=NimBinaries ARCH_OVERRIDE=${PLATFORM} QUICK_AND_DIRTY_COMPILER=1 update
make -j${ncpu} CI_CACHE=NimBinaries ARCH_OVERRIDE=${PLATFORM} QUICK_AND_DIRTY_COMPILER=1 update
echo echo
nim --version ./env.sh nim --version

15
env.sh
View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# This is the compiler version that will get used everywher.
NIM_VERSION="f45bdea94ac4ed9a9bae03426275456aeb0cab2a" NIM_VERSION="f45bdea94ac4ed9a9bae03426275456aeb0cab2a"
NIM_REPO_URL="https://github.com/gmega/Nim" NIM_REPO_URL="https://github.com/gmega/Nim"
@ -8,6 +9,16 @@ NIM_REPO_URL="https://github.com/gmega/Nim"
REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})" REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
ABS_PATH="$(cd ${REL_PATH}; pwd)" ABS_PATH="$(cd ${REL_PATH}; pwd)"
ENV_FILE="${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh"
export NIM_COMMIT="${NIM_COMMIT:-${NIM_VERSION}}" export NIM_COMMIT="${NIM_COMMIT:-${NIM_VERSION}}"
export NIM_REPO="${NIM_REPO_URL:-${NIM_REPO_URL}}" if ! [ -f "$ENV_FILE" ]; then
source ${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh # Before the first "make update", the env file doesn't exist, so just run
# the command that comes after (without a child shell), if any. Running
# ./env.sh make update will cause the right compiler to be built right from
# the start.
echo "Nimbus env file not found"
"$@"
else
source "${ENV_FILE}"
fi