build script tweaks -> date in folder name #91

This commit is contained in:
Matthew Kennedy 2023-05-12 00:18:52 -07:00
parent 7e30d54dfa
commit 8f6c81dbac
2 changed files with 8 additions and 8 deletions

View File

@ -5,8 +5,8 @@ on:
pull_request:
workflow_dispatch:
inputs:
lts:
description: 'LTS Build'
do_upload:
description: 'Upload Build Outputs'
required: false
type: boolean
@ -182,7 +182,7 @@ jobs:
if [ "${{github.repository}}" = "FOME-Tech/fome-fw" ]\
&& [ "${{github.event_name}}" = "push" ]\
&& [ "${{github.ref}}" = "refs/heads/master" ]\
|| [ "${{toJSON(inputs.lts)}}" = "true" ]; then
|| [ "${{toJSON(inputs.do_upload)}}" = "true" ]; then
echo "full=true" >> $GITHUB_ENV
echo "upload=true" >> $GITHUB_ENV
elif [ "${{github.event_name}}" = "push" ]\
@ -268,7 +268,7 @@ jobs:
- name: Package Bundle
if: ${{ env.full == 'true' }}
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} "${{matrix.ini-file}}" ${{ github.ref_name }} ${{ toJSON(inputs.lts) }}
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} "${{matrix.ini-file}}" ${{ github.ref_name }}
# - name: Upload HyperTuner .ini
# if: ${{ env.full == 'true' && env.upload == 'true' }}

View File

@ -8,15 +8,15 @@ echo "RUSEFI_BUILD_FTP_USER=$RUSEFI_BUILD_FTP_USER"
TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
if [ "$4" = "true" ]; then
export FOLDER="temp/fome.${3}.${BUNDLE_NAME}"
if [ "$3" = "master" ]; then
export FOLDER="temp/fome.snapshot.${TIMESTAMP}.${BUNDLE_NAME}"
else
export FOLDER="temp/fome.snapshot.${BUNDLE_NAME}"
export FOLDER="temp/fome.${3}.${BUNDLE_NAME}"
fi
export BUNDLE_FULL_NAME="fome_bundle_${BUNDLE_NAME}"
bash misc/jenkins/build_working_folder.sh "$3" "$4"
bash misc/jenkins/build_working_folder.sh
pwd
echo "exiting $SCRIPT_NAME"