8000 fix conflicts · optimizely/java-sdk@0fe4a81 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0fe4a81

Browse files
mnoman09jaeopt
authored andcommitted
fix conflicts
1 parent f4b7d7a commit 0fe4a81

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/integration_test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
test:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
# You should create a personal access token and store it in your repository
2121
token: ${{ secrets.CI_USER_TOKEN }}
@@ -39,15 +39,15 @@ jobs:
3939
BUILD_NUMBER: ${{ github.run_id }}
4040
TESTAPP_BRANCH: master
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 }}
50+
TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
5151
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
5252
EVENT_MESSAGE: ${{ github.event.message }}
5353
HOME: 'home/runner'

0 commit comments

Comments
 (0)
0