8000 Prepare 4.x.x branch for future releases · optimizely/javascript-sdk@2c4865a · GitHub
[go: up one dir, main page]

Skip to content

Commit 2c4865a

Browse files
committed
Prepare 4.x.x branch for future releases
1 parent 2c97095 commit 2c4865a

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

.github/workflows/integration_test.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,17 @@ jobs:
3737
SDK: javascript
3838
FULLSTACK_TEST_REPO: ${{ inputs.FULLSTACK_TEST_REPO }}
3939
BUILD_NUMBER: ${{ github.run_id }}
40-
TESTAPP_BRANCH: master
40+
TESTAPP_BRANCH: test-4.x.x
4141
GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
42-
TRAVIS_EVENT_TYPE: ${{ github.event_name }}
42+
EVENT_TYPE: ${{ github.event_name }}
4343
GITHUB_CONTEXT: ${{ toJson(github) }}
44-
TRAVIS_REPO_SLUG: ${{ github.repository }}
45-
TRAVIS_PULL_REQUEST_SLUG: ${{ github.repository }}
44+
#REPO_SLUG: ${{ github.repository }}
45+
PULL_REQUEST_SLUG: ${{ github.repository }}
4646
UPSTREAM_REPO: ${{ github.repository }}
47-
TRAVIS_COMMIT: ${{ github.sha }}
48-
TRAVIS_PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
49-
TRAVIS_PULL_REQUEST: ${{ github.event.pull_request.number }}
47+
PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
48+
PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
5049
UPSTREAM_SHA: ${{ github.sha }}
51-
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
50+
TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
5251
EVENT_MESSAGE: ${{ github.event.message }}
5352
HOME: 'home/runner'
5453
run: |

.github/workflows/javascript.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Javascript
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ 4.x.x ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ 4.x.x ]
88

99
jobs:
1010
lint_markdown_files:
11-
uses: optimizely/javascript-sdk/.github/workflows/lint_markdown.yml@master
11+
uses: optimizely/javascript-sdk/.github/workflows/lint_markdown.yml@4.x.x
1212

1313
lint:
1414
runs-on: ubuntu-latest
@@ -27,13 +27,13 @@ jobs:
2727
npm run lint
2828
2929
integration_tests:
30-
uses: optimizely/javascript-sdk/.github/workflows/integration_test.yml@master
30+
uses: optimizely/javascript-sdk/.github/workflows/integration_test.yml@4.x.x
3131
secrets:
3232
CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
3333
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
3434

3535
fullstack_production_suite:
36-
uses: optimizely/javascript-sdk/.github/workflows/integration_test.yml@master
36+
uses: optimizely/javascript-sdk/.github/workflows/integration_test.yml@4.x.x
3737
with:
3838
FULLSTACK_TEST_REPO: ProdTesting
3939
secrets:
@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ubuntu-latest
6767
strategy:
6868
matrix:
69-
node: [ '8', '9', '10', '12', '14' ]
69+
node: [ '8', '9', '10', '12', '14', '16', '18' ]
7070
steps:
7171
- uses: actions/checkout@v3
7272
- name: Set up Node ${{ matrix.node }}

packages/optimizely-sdk/lib/core/bucketer/index.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ describe('lib/core/bucketer', function () {
355355
it('should return an error if it cannot generate the hash value', function () {
356356
assert.throws(function () {
357357
bucketer._generateBucketValue(null);
358-
}, sprintf(ERROR_MESSAGES.INVALID_BUCKETING_ID, 'BUCKETER', null, "Cannot read property 'length' of null"));
358+
}, new RegExp('^' + sprintf(ERROR_MESSAGES.INVALID_BUCKETING_ID, 'BUCKETER', null, '')));
359359
});
360360
});
361361

packages/optimizely-sdk/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0