File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed
Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ name: ci-cd
22on :
33 pull_request :
44 branches :
5- - master
5+ - main
66 - development
77 push :
88 branches :
5757 run : BUILD_BRANCH=$(echo "${GITHUB_REF#refs/heads/}") npm run build
5858
5959 - name : Store assets
60- if : ${{ github.event_name == 'push' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master ') }}
60+ if : ${{ github.event_name == 'push' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/main ') }}
6161 uses : actions/upload-artifact@v4
6262 with :
6363 name : assets
@@ -107,7 +107,7 @@ jobs:
107107 name : Upload assets
108108 runs-on : ubuntu-latest
109109 needs : build
110- if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/master ' }}
110+ if : ${{ github.event_name == 'push' && github.ref == 'refs/heads/main ' }}
111111 strategy :
112112 matrix :
113113 environment :
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ name: sonar-scan
22on :
33 pull_request :
44 branches :
5- - master
5+ - main
66 - development
77 push :
88 branches :
9- - master
9+ - main
1010 - development
1111
1212jobs :
Original file line number Diff line number Diff line change @@ -7,6 +7,6 @@ const VERSION = pkg.version;
77module . exports = env => merge ( common , {
88 mode : 'development' ,
99 output : {
10- filename : `[name]${ env . branch !== 'master ' ? `-dev-${ VERSION } ` : `-${ VERSION } ` } .js`
10+ filename : `[name]${ env . branch !== 'main ' ? `-dev-${ VERSION } ` : `-${ VERSION } ` } .js`
1111 }
1212} ) ;
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const VERSION = pkg.version;
77module . exports = env => merge ( common , {
88 mode : 'production' ,
99 output : {
10- filename : `[name]${ env . branch !== 'master ' ? `-dev-${ VERSION } ` : `-${ VERSION } ` } .min.js`
10+ filename : `[name]${ env . branch !== 'main ' ? `-dev-${ VERSION } ` : `-${ VERSION } ` } .min.js`
1111 } ,
1212 performance : {
1313 hints : 'error' , // build fails if asset size exceeded
You can’t perform that action at this time.
0 commit comments