stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct asset directory for travis

Browse source
This commit is contained in:
mazmazz 2019-01-02 18:19:44 -05:00
parent 4d4b048ead
commit 9b3174c4f4
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.travis.yml
View file

@ -593,7 +593,8 @@ install:
before_script: before_script:
# OLDPWD is root repo folder # OLDPWD is root repo folder
- OLDPWD=$PWD - OLDPWD=$PWD
- mkdir -p "$OLDPWD/assets/installer" - __ASSET_DIRECTORY="$OLDPWD/assets/installer"
- mkdir -p "$__ASSET_DIRECTORY"
- cd "$HOME/srb2_cache" - cd "$HOME/srb2_cache"
# Get stat command so we know what the cached archive date is. # Get stat command so we know what the cached archive date is.
@ -610,7 +611,7 @@ before_script:
echo "$(basename $ASSET_ARCHIVE_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_PATH))"; echo "$(basename $ASSET_ARCHIVE_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_PATH))";
fi; fi;
wget --verbose --server-response -N "$ASSET_ARCHIVE_PATH"; wget --verbose --server-response -N "$ASSET_ARCHIVE_PATH";
7z x "$(basename $ASSET_ARCHIVE_PATH)" -o"$OLDPWD/assets/installer" -aos; 7z x "$(basename $ASSET_ARCHIVE_PATH)" -o"$__ASSET_DIRECTORY" -aos;
fi; fi;
# Get optional files too # Get optional files too
@ -619,16 +620,16 @@ before_script:
echo "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_OPTIONAL_PATH))"; echo "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_OPTIONAL_PATH))";
fi; fi;
wget --verbose --server-response -N "$ASSET_ARCHIVE_OPTIONAL_PATH"; wget --verbose --server-response -N "$ASSET_ARCHIVE_OPTIONAL_PATH";
7z x "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH)" -o"$OLDPWD/assets/installer" -aos; 7z x "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH)" -o"$__ASSET_DIRECTORY" -aos;
fi; fi;
# Copy assets to repo staging folder, then go back to root repo folder # Go back to root repo folder
- cd "$OLDPWD" - cd "$OLDPWD"
# Prepare CMake asset lists # Prepare CMake asset lists
- SRB2_ASSET_HASHED=$(echo ${ASSET_FILES_HASHED// /\;}) - SRB2_ASSET_HASHED=$(echo ${ASSET_FILES_HASHED// /\;})
- SRB2_ASSET_DOCS=$(echo ${ASSET_FILES_DOCS// /\;}) - SRB2_ASSET_DOCS=$(echo ${ASSET_FILES_DOCS// /\;})
- SRB2_ASSET_DIRECTORY="$OLDPWD/assets/installer" - SRB2_ASSET_DIRECTORY="$__ASSET_DIRECTORY"
# Prepare CMake # Prepare CMake
- mkdir build - mkdir build