Skip to content

Commit 8c806ab

Browse files
committed
Replace master with main for HDL repo
1 parent 403f780 commit 8c806ab

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dockerHost = 'docker'
99

1010
////////////////////////////
1111

12-
hdlBranches = ['master','hdl_2021_r2']
12+
hdlBranches = ['main','hdl_2021_r2']
1313

1414
stage("Build Toolbox") {
1515
dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) {
@@ -128,7 +128,7 @@ node {
128128
unstash "builtSources"
129129
uploadArtifactory('HighSpeedConverterToolbox','*.mltbx')
130130
}
131-
if (env.BRANCH_NAME == 'master') {
131+
if (env.BRANCH_NAME == 'main') {
132132
cstage('Deploy Production', "", flags) {
133133
unstash "builtSources"
134134
uploadFTP('HighSpeedConverterToolbox','*.mltbx')

Jenkinsfile_dev

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dockerHost = 'docker'
77

88
////////////////////////////
99

10-
hdlBranches = ['master']
10+
hdlBranches = ['main']
1111

1212
stage("Build Toolbox") {
1313
dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) {
@@ -22,14 +22,14 @@ stage("Build Toolbox") {
2222
sh 'make -C ./CI/scripts gen_tlbx'
2323
}
2424
} catch(Exception ex) {
25-
if (branchName == 'master') {
25+
if (branchName == 'main') {
2626
error('Production Toolbox Build Failed')
2727
}
2828
else {
2929
unstable('Development Build Failed')
3030
}
3131
}
32-
if (branchName == 'master') {
32+
if (branchName == 'main') {
3333
archiveArtifacts artifacts: '*.mltbx'
3434
stash includes: '**', name: 'builtSources', useDefaultExcludes: false
3535
}
@@ -39,7 +39,7 @@ stage("Build Toolbox") {
3939
/////////////////////////////////////////////////////
4040

4141
boardNames = ['daq2','ad9081']
42-
dockerConfig.add("-e HDLBRANCH=master")
42+
dockerConfig.add("-e HDLBRANCH=main")
4343

4444
stage("HDL Tests") {
4545
dockerParallelBuild(boardNames, dockerHost, dockerConfig) {
@@ -100,7 +100,7 @@ node {
100100
unstash "builtSources"
101101
uploadArtifactory('HighSpeedConverterToolbox','*.mltbx')
102102
}
103-
if (env.BRANCH_NAME == 'master') {
103+
if (env.BRANCH_NAME == 'main') {
104104
stage('Deploy Production') {
105105
unstash "builtSources"
106106
uploadFTP('HighSpeedConverterToolbox','*.mltbx')

0 commit comments

Comments
 (0)