Skip to content

Commit 32d069f

Browse files
Merge pull request #243 from splitio/update-default-branch
Update default branch
2 parents c092217 + 7879bbc commit 32d069f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/ci-cd.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '**'
77
pull_request:
88
branches:
9-
- master
9+
- main
1010
- development
1111

1212
concurrency:
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
5050

5151
- name: SonarQube Scan (Push)
52-
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development')
52+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development')
5353
uses: SonarSource/[email protected]
5454
env:
5555
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
7777
-Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }}
7878
7979
- name: Store assets
80-
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development')
80+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development')
8181
uses: actions/upload-artifact@v4
8282
with:
8383
name: assets
@@ -127,7 +127,7 @@ jobs:
127127
name: Upload assets
128128
runs-on: ubuntu-latest
129129
needs: build
130-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
130+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
131131
strategy:
132132
matrix:
133133
environment:

webpack.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ module.exports = env => merge(common, {
88
mode: 'development',
99
devtool: 'source-map',
1010
output: {
11-
filename: `[name]${env.branch !== 'master' ? '-dev-' + VERSION : '-' + VERSION}.js`
11+
filename: `[name]${env.branch !== 'main' ? '-dev-' + VERSION : '-' + VERSION}.js`
1212
}
1313
});

webpack.prod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const VERSION = pkg.version;
77
module.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
});

0 commit comments

Comments
 (0)