Changeset 758 for branches


Ignore:
Timestamp:
Mar 6, 2016, 10:31:57 PM (4 years ago)
Author:
amain
Message:

Fix upload for 15.05

Location:
branches/15.05
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/15.05/buildbot/upload.sh

    r744 r758  
    6464    ddir=snapshots
    6565else
    66     sdir=bin/${branch}
    67     ddir=${branch}
     66    # strip branches/ from branch name
     67    dbranch=${branch/branches\//}
     68    sdir=bin/${dbranch}
     69
     70    case "${dbranch}" in
     71        15.05) ddir=chaos_calmer/${dbranch} ;;
     72        *)     ddir=unknown/${dbranch}      ;;
     73    esac
    6874fi
    6975
  • branches/15.05/rules/debwrt.mk

    r726 r758  
    1717
    1818RELEASE:=15.05
    19 BUILD_CYCLE_ID:=1
     19BUILD_CYCLE_ID:=
    2020VERSION:=$(BUILD_CYCLE_ID)
    2121RELEASE_DATE=$(shell LC_ALL=c date +"%d %B %Y")
Note: See TracChangeset for help on using the changeset viewer.